AAAA
Minor changes on some classes
Minor
Merge branch 'master' of https://github.com/penjurov/TeamGeorgeOrwell

Conflicts:
	RPG/RPG.v12.suo
	RPG/RPG/RPG/Objects/Heroes.cs
	RPG/RPG/RPG/Screens/GameScreen.cs
	RPG/RPG/RPG/bin/x86/Debug/RPG.exe
	RPG/RPG/RPG/bin/x86/Debug/RPG.pdb
	RPG/RPG/RPG/obj/x86/Debug/ContentPipeline-{444667E5-9B2D-4627-A32F-C35DBF045B1C}.xml
	RPG/RPG/RPG/obj/x86/Debug/RPG.csproj.FileListAbsolute.txt
	RPG/RPG/RPG/obj/x86/Debug/RPG.exe
	RPG/RPG/RPG/obj/x86/Debug/RPG.pdb
	RPG/RPG/RPG/obj/x86/Debug/Rpg.csprojResolveAssemblyReference.cache