#135 Map stuff
#135 Map finished
Merge pull request #205 from Tickthokk/maps

Maps