g
Merge branch 'origin/master'

Conflicts:
	Orienteering_Guide/Resources/LocalFiles.bin