Really fix player states this time
Merge pull request #23 from niamu/tile_collisions

Really fix player states this time