Made this compatible with working CMake build system
Merge branch 'alex' of https://github.com/Nashoba-Robotics/Nashoba-Robotics2013-SimpleRobot into alex

Conflicts:
	CMakeLists.txt