Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
Merge branch 'master' of github.com:anidev/612-2013
these are the presets that Adrian made. Note: some of the methods in here may be arbitrary or already done in other files
fixed presets to do whatever was needed
Swarage is Wrong!!!

Swarage Is No Longer A Professional Programmer he is now amature >:|
Critical Change
Small Change
Changed done state to off and added done variable
Merge branch 'master' of github.com:anidev/612-2013

Conflicts:
	AutoShooter.h
Fixed compile error regarding DONE in AutoShooter.cpp
Merge branch 'master' of git://github.com/JeffTolbert/612-2013

Conflicts:
	AutoShooter.cpp
Merge pull request #63 from swarage/master

Adrian's presets stuff
Merge branch 'master' of git://github.com/anidev/612-2013
ports for feeder and launcher