Begin work on map generator
Conflict resolution
Merge branch 'master' of github.com:avkhanov/dm

Conflicts:
	src/main.cpp