Changed the SingleplayerGUI to accept buttons and to display the info
Merge origin/master
Changed the SingleplayerGUI to accept buttons and to display the info
Changed the SingleplayerGUI to accept buttons and to display the info
This is super obnoxious, I can't get the commit to work
The end
Merge origin/master

Conflicts:
	CapAndTradeSimulation/src/capAndTradeUserInterface/SinglePlayerGUI.java