fix
Merge branch 'master' of https://github.com/tEFFx/piggy

Conflicts:
	Piggy_Game/Game.cpp