test
Merge branch 'master' of https://github.com/razorsharps/RPG

Conflicts:
	src/sources/Game.cpp