Test
Merge branch 'master' of https://github.com/penjurov/TeamGeorgeOrwell

Conflicts:
	RPG/RPG.v12.suo
	RPG/RPG/RPG/GameStarter.cs
	RPG/RPG/RPG/Interfaces/IMovable.cs
	RPG/RPG/RPG/Objects/MeleUnits.cs
	RPG/RPG/RPG/Objects/RangedUnits.cs
	RPG/RPG/RPGContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache