player movement and collision detection updated
Merge branch 'master' of https://github.com/Trayus/webjam