Josh
josh
Merge branch 'master' of https://github.com/endert/Soulmate

Conflicts:
	Soulmate/Soulmate.v12.suo
	Soulmate/Soulmate/Classes/InGame.cs
	Soulmate/Soulmate/Soulmate.csproj
	Soulmate/Soulmate/bin/Debug/Soulmate.exe
	Soulmate/Soulmate/bin/Debug/Soulmate.pdb
	Soulmate/Soulmate/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Soulmate/Soulmate/obj/Debug/Soulmate.csproj.FileListAbsolute.txt
	Soulmate/Soulmate/obj/Debug/Soulmate.exe
	Soulmate/Soulmate/obj/Debug/Soulmate.pdb
josh
Merge branch 'master' of https://github.com/endert/Soulmate

Conflicts:
	Soulmate/Soulmate.v12.suo
josh
Merge branch 'master' of https://github.com/endert/Soulmate

Conflicts:
	Soulmate/Soulmate.v12.suo
	Soulmate/Soulmate/Classes/Player.cs
	Soulmate/Soulmate/bin/Debug/Soulmate.exe
	Soulmate/Soulmate/bin/Debug/Soulmate.pdb
	Soulmate/Soulmate/obj/Debug/Soulmate.exe
	Soulmate/Soulmate/obj/Debug/Soulmate.pdb