Merging
Added trade details to tech GUI
Merge branch 'master' of github.com:Civilization-CSSE376/Civilization