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 functions in state cpp and h