Final 2014 competition code
Merge branch 'master' of https://github.com/Hjax/FRC-2014 into Hjax-master

Conflicts:
	Robot_2014.cpp
Final 2014 code
Merge pull request #8 from FRC1740/Hjax-master

Hjax master