Fixed Infastructure
Merge branch 'Second-Robot' of
https://github.com/FRCTeam1277/2014-Robot-Code.git into Second-Robot

Conflicts:
	2014 Robot/src/team1277/org/robot/MainRobot.java
	2014 Robot/src/team1277/org/robot/ManualMethods.java