commit so I can git pull
Merge branch 'master' of https://github.com/dWarf-In-thE-FlaSk/Proj_361
almost working gamestate, map needs to set object back to empty