Merging
Merge branch 'master' of https://github.com/Lootacris/Insanity

Conflicts:
	SLAVAJOHN-5-22/SlavaJohnRPG-GUI-03/SlavaJohnRPG-GUI-03/GameEngine.cs