Added history tab
Merge branch 'master' of https://github.com/JSybrandt/TradingGame

Conflicts:
	ClientWindow/ClientWindow/Debug/ClientWindow.vcxproj.GenerateResource.Cache
	ClientWindow/ClientWindow/Debug/Game.obj
	ClientWindow/ClientWindow/Debug/GameWindow.obj
	ClientWindow/ClientWindow/Debug/Inventory.obj
	ClientWindow/ClientWindow/Debug/Player.obj
	ClientWindow/ClientWindow/Debug/Town.obj
	ClientWindow/ClientWindow/Debug/main.obj