Merge branch 'master' of git://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/anidev/612-2013
changed functions in state cpp and h
Merge pull request #18 from AlonBendelac/master

changed state cpp and h