Conflict 2
Merge origin/master

Conflicts:
	CapAndTradeSimulation/src/capandtradesimulation/Controller.java