Map is now a class.
Map generator added.
Merge branch 'mapgenerator'