merge map
Merge branch 'master' of https://github.com/ClubEngine/PLT

Conflicts:
	main.cpp
Merge branch 'master' of https://github.com/ClubEngine/PLT

Conflicts:
	gameplay/GameState.cpp
	main.cpp