Signed-off-by: Sean Cardello <seanmc602@gmail.com>
Merge branch 'master' of git@github.com:mcm101/HallwayNavApp.git

* 'master' of git@github.com:mcm101/HallwayNavApp.git:
  changes!

Conflicts:
	HallwayNavApp.ino

Signed-off-by: Sean Cardello <seanmc602@gmail.com>