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

Conflicts:
	source/BaseMonster.cpp
	source/Map.cpp
	source/header/Map.h
	source/mainArtur.cpp