GarrettManley/The-Trade-Network — pull request #5 by GarrettManley (2014-10-01 22:39:37+00:00)
Title: Gui design

Attempt to merge GUI and master