updatesss
updates

Merge branch 'master' of https://github.com/orichalque/Fuzzy_Octo_Nemesis

Conflicts:
	MapGenerator/Generator.cpp
	MapGenerator/Rectangle.cpp
	MapGenerator/a.out