added Map class
Resolved merge conflics
resolved conflict
Merge branch 'master' of https://github.com/amonsch/GalacticTrollCastle

Conflicts:
	map/map_generator.h
	map/mapatom.h
merged mapatom, map to new changes