added collision detection to map
Merge branch 'master' of github.com:kr15h/ninjasinthebox-game