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

Conflicts:
	RPG/RPG.v12.suo
	RPG/RPG/RPG/Interfaces/IMovable.cs
	RPG/RPG/RPG/Objects/MeleUnits.cs
	RPG/RPG/RPG/Objects/RangedUnits.cs
	RPG/RPG/RPG/RPG.csproj.Debug.cachefile
	RPG/RPG/RPG/obj/x86/Debug/ContentPipeline-{444667E5-9B2D-4627-A32F-C35DBF045B1C}.xml
	RPG/RPG/RPG/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RPG/RPG/RPG/obj/x86/Debug/RPG.csproj.FileListAbsolute.txt
	RPG/RPG/RPG/obj/x86/Debug/Rpg.csprojResolveAssemblyReference.cache
	RPG/RPG/RPG/obj/x86/Debug/cachefile-{444667E5-9B2D-4627-A32F-C35DBF045B1C}-targetpath.txt
	RPG/RPG/RPGContent/obj/x86/Debug/RPGContent.contentproj.FileListAbsolute.txt
Removed Camera