delete map 7
merge scoring
remerge ...
Merge branch 'master' into physics
Merging and getting changes back into the game!