second commit
Merge branch 'master' of github.com:fishCoder/MapGenerator

Conflicts:
	FieldMapGenerator.cpp
	Generator.cpp
	Generator.h
	Output.h
	main.cpp