Fixed map loading
Merge branch 'master' of https://github.com/qcrist/GameDesign