bugfix, fixes bugs #6 and #7.
Merge branch 'testing'

Conflicts:
	MyRobot.cpp
	PPC603gnu/IterativeTemplate/Debug/IterativeTemplate.out
	PPC603gnu/IterativeTemplate_partialImage/Debug/IterativeTemplate_partialImage.o
	PPC603gnu/IterativeTemplate_partialImage/Debug/Objects/FRC_3164_2014_Aerial_Assist/MyRobot.d
	PPC603gnu/IterativeTemplate_partialImage/Debug/Objects/FRC_3164_2014_Aerial_Assist/MyRobot.o