um, adds stuff. I'm preparing for the hurricane of merges
Merge branch 'master' of https://github.com/FRC-3637-Daleks/Karen

Conflicts:
	Karen.cpp
	Subsystems/Catapult.cpp