Swarage is Wrong!!!

Swarage Is No Longer A Professional Programmer he is now amature >:|
Critical Change
Small Change
Merge branch 'master' of git://github.com/JeffTolbert/612-2013

Conflicts:
	AutoShooter.cpp