Merged Laptop 1 code
Merge remote-tracking branch 'origin/master'

Conflicts:
	2013FinalCode/MyRobot.cpp
	2013FinalCode/PPC603gnu/SimpleTemplate/Debug/SimpleTemplate.out
	ButtonTest/.cproject
	MecanumDrive/MyRobot.cpp
	MotorTest/MotorTest.cpp
	RoboRealmTest/.wrproject
	Servo/.wrproject
	Servo/MyRobot.cpp
	Servo/PPC603gnu/Servo/Debug/Servo.out
	SpikeSwitching/.cproject
	nodnarb/MyRobot.cpp
	nodnarb/PPC603gnu/SimpleTemplate/Debug/SimpleTemplate.out
Merge remote-tracking branch 'origin/master'