Added collision and improved detection of states
Merge pull request #11 from adrianob/collision_and_more

Added collision and improved detection of states