Fixing up navigation

Added currentSensor and shiz
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tidying2/state_michael2/Motors.ino
	Tidying2/state_michael2/Navigation.ino
	Tidying2/state_michael2/Switch.cpp
	Tidying2/state_michael2/state_michael2.ino
Double fixed