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

Conflicts:
	source/Player.cpp
	source/header/Player.h