Resolved conflicts
Update README.md
Merge branch 'FinalBotCode' of https://github.com/OHSBlazerbots/RobotCode2014.git