Continuing simple transactions.
I'm too foo for this bar.
Merge remote-tracking branch 'origin/master' into transaction
Well, I did something.
Partial enums. Will rebase on Sam's changes later.
Including Sam's changes.
Merge remote-tracking branch 'origin/gui' into transaction
Conflicts:
	src/core/Actor.java
	src/core/Runner.java
	src/core/commodities/Commodity.java
Resolved by Brian O Oluwo
Merge remote-tracking branch 'origin/transaction' into gui

Conflicts:
	src/core/MarketSimulation.java
	src/core/Transaction.java