fixed some state machine issue
Merge branch 'master' of https://github.com/Winklebot/Winklebot

Conflicts:
	Starting_Orientation_Test/Starting_Orientation_Test.ino