mapa
Merge branch 'master' of https://github.com/zergx1/mario.git

Conflicts:
	source/GlobalObjects.cpp
	source/Player.cpp
	source/header/GlobalObjects.h
	source/header/Map.h
Merge branch 'master' of https://github.com/zergx1/mario.git
Merge branch 'master' of https://github.com/zergx1/mario.git

Conflicts:
	source/header/GlobalObjects.h