commiting to pull
Merge branch 'master' of http://github.com/Psylock524/robotmachine

Changed Pin Numbers for motor control

Conflicts:
	newRobot/main_GUI/main_GUI.pde