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 #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
Cleaned up some code
Merge branch 'master' of git://github.com/anidev/612-2013
Merge pull request #17 from AlonBendelac/master

changed state_driving
Merge branch 'master' of git://github.com/anidev/612-2013
Changed type of robot_state to lowercase