Added Player, collision detection code
Merge branch 'master' of ssh://github.com/mdietz94/haskellgame