Update

player movement
Merge branch 'master' of https://github.com/TisLars/Defrag