Updated history, more info.
Merge branch 'master' of https://github.com/JSybrandt/TradingGame

Conflicts:
	ClientWindow/ClientWindow/Debug/ClientWindow.vcxproj.GenerateResource.Cache
	ClientWindow/ClientWindow/Debug/ClientWindow.vcxprojResolveAssemblyReference.cache