Merge remote-tracking branch 'original/master' into develop
More optimizations and file organization. Changed user response to be immediate upon key press.
Merge remote-tracking branch 'original/master' into develop

Conflicts:
	ConTextRPG/ConTextMP/ConTextMP.csproj
	ConTextRPG/ConTextMP/bin/Debug/ConTextMP.exe
	ConTextRPG/ConTextMP/bin/Debug/ConTextMP.pdb
	ConTextRPG/ConTextMP/obj/Debug/ConTextMP.exe
	ConTextRPG/ConTextMP/obj/Debug/ConTextMP.pdb
	ConTextRPG/ConTextRPG.v11.suo
	ConTextRPG/ConTextRPG/ConTextRPG.csproj
	ConTextRPG/ConTextRPG/MPGame/Multiplayer.cs
	ConTextRPG/ConTextRPG/Program.cs
	ConTextRPG/ConTextRPG/bin/Debug/ConTextRPG.exe
	ConTextRPG/ConTextRPG/bin/Debug/ConTextRPG.pdb
	ConTextRPG/ConTextRPG/obj/Debug/ConTextRPG.exe
	ConTextRPG/ConTextRPG/obj/Debug/ConTextRPG.pdb
Rebase
	Removed the MP port for a while. Best to focus on SP
	Deleted MP Port
	Meep
Rebase
Merge branch 'develop' of https://github.com/Giovani-Brady/ConTextRPG into develop

Conflicts:
	ConTextRPG/ConTextRPG.v11.suo
	ConTextRPG/ConTextRPG/ConTextRPG.csproj
	ConTextRPG/ConTextRPG/Program.cs
	ConTextRPG/ConTextRPG/obj/Debug/ConTextRPG.pdb
Setting up Inventory feature
Merge branch 'develop'
Setup for Equipment and Inventory
Finished equiment and inventory set up
Finished Equipment implementation
Merge pull request #4 from Giovani-Brady/master

Equipment and Inventory