Added laptop 2 updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	MotorTest/MotorTest.cpp
	MotorTest/PPC603gnu/MotorTest/Debug/MotorTest.out
	Servo/MyRobot.cpp
Merge remote-tracking branch 'origin/master'