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

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