Merge pull request #1 from LiddleDiddle/work

Work
Assignment 4 unfinished
working box2d
update for desktop
Merge branch 'work' of https://github.com/LiddleDiddle/Magical-Tower into work