i added my name - Alon Bendelac
wrote lift file
shooterAim Update
Merge branch 'master' of https://github.com/anidev/612-2013
? why was that changed?
Merge pull request #14 from swarage/master

fixed Launcher.h and added a few files (will fix their names later)
Lowercase files
Minor changes to feeder
Minor stylistic changes to launcher
Changed AUTHORS  -Zachary Alfakir
Merge pull request #15 from ZackAlfakir/master

Authors
Removed backup AUTHORS.rst file
Merge branch 'master' of https://github.com/anidev/612-2013
.gitignore change
Fixes so it compiles
Merge branch 'master' of git://github.com/anidev/612-2013

Conflicts:
	AUTHORS.rst
added state class
Merge pull request #16 from AlonBendelac/master

changed authors 
Added empty state files
edited the state_driving file