Mapa primeira versão
Mapa final
Merge branch 'Gabriela' of https://github.com/nikopolides/thelastworldwar into Gabriela

Conflicts:
	game.cpp
	globalsGame.cpp
	globalsGame.h