Basic commit
this is bad.
must be fixed.
Merge branch 'master' of https://github.com/BriarWoodsHighRobotics/robotics13-14

Conflicts:
	autonomous.c
	manual.c
	tools.h
Merge branch 'master' into fixed_state