Did some sweet old code cleaning
Merge branch 'master' of https://github.com/Quist/ifiscript

Conflicts:
	src/locationRetriver.c
	src/location_retriver.h
	src/main.c
	src/main.h