Shrank the level some

It's now 12x9 instead of 15x10.  Not sure why it didn't go to 12x8 but whatever.
Also fixed the floor being in front of player/enemies/obstacles.
Merge remote-tracking branch 'origin/master'