adds navbar to game
merges conflicts
merges conflicts
fixes mapId bug
Merge pull request #21 from Dokko1230/master

paints some lipstick