minor changes
Merge branch 'master' of https://github.com/halleritis/FP2Project

Conflicts:
	src/Locations.txt