Unkonown merge difference between different directories are merged together.

Samo Penic

2015-10-06 6c3bb91fea92c5013507bdf4f5ac49e889e213ff

1
Original written by Dan Kroll in FORTRAN. Code was then largely adapted and commented by Miha Fosnaric-Fosni. Rewritten into C by Samo Penic-Peni, with help of Miha's extensive explanations.