Preparing for merge
Merged with schoolwork
Merge branch 'alex' of https://github.com/Nashoba-Robotics/Nashoba-Robotics2013-SimpleRobot into alex

Conflicts:
	Drive.cpp
	Drive.hpp
	Hardware.hpp