Finish Four basic changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	AutonomousFunctions.h