changed to two motors and first pass at encoders
commented line
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

Resolved:
	MyRobot.cpp