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

Conflicts:
	RPG/RPG/RPG/RPG.csproj.Debug.cachefile
	RPG/RPG/RPG/bin/x86/Debug/RPG.pdb
	RPG/RPG/RPG/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RPG/RPG/RPG/obj/x86/Debug/Rpg.csproj.FileListAbsolute.txt
	RPG/RPG/RPGContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RPG/RPG/RPGContent/obj/x86/Debug/RPGContent.contentproj.FileListAbsolute.txt