starting by making basic map
Merge branch 'master' of github.com:ZimonD/ContextCG7

Conflicts:
	src/server/src/disastercontrol/state/preventer/main/Map.java