Merged desktop with master
Merge remote-tracking branch 'origin/master'

Conflicts:
	2013FinalCode/MyRobot.cpp
	2013FinalCode/PPC603gnu/SimpleTemplate/Debug/SimpleTemplate.out