Merge branch 'master' of https://github.com/mcm101/HallwayNavApp

Conflicts:
	HallwayNavApp.ino
Merge branch 'master' of https://github.com/mcm101/HallwayNavApp

Conflicts:
	HallwayNavApp.ino
	headband.ino
	sharpIR.ino