Reformatting
Merge branch 'master' of https://github.com/slisovski/GeoLight

Conflicts:
	R/GeoLight.R