Hotfix for Actor.evaluateMarket()
Merge remote-tracking branch 'origin/master' into networking

Conflicts:
	src/core/MarketSimulation.java
	src/core/actors/Actor.java
	src/core/channels/OfferChannel.java
Merge remote-tracking branch 'origin/networking' into ai
Converted Actor into an enum - IN PROGRESS
Need some presets like FARMER, MERCHANT, BAKER, etc.
Have to change the parameters in the constructor
Need to find a new place for BlockingQueue Transaction and LinkedList
commodities.
Well Market Simulation and Offer Channel seem to play ball with one another, but MarketCanvas won't update. Might consider movving it to a swing worker or an SwingUtilities.invokeLater sort of deal. Only time will tell. Also switched to IntelliJ and reformatted everything for better or worse. Oh well.
REFORMATTED
More Code Formatting courtesy of IntelliJ.
Got rid of debug statements.
Revert "REFORMATTED"

This reverts commit f0848d6374cb74e690c53d12363cda851ad45cd4.
Undoing formatting.
Merge remote-tracking branch 'origin/networking' into gui
Got rid of debug statements. 4 Realz.
Very quick commit
Allowing tickers to change the number of lines
Merge remote-tracking branch 'remotes/origin/gui' into networking
Merge didn't work?
Revert "Merge didn't work?" because the merge worked.
This reverts commit 01e4f3aa5ca28000473779440d237c16734d4e60.
Button added
Better Text Input
Merge remote-tracking branch 'origin/gui' into ai

Conflicts:
	src/core/actors/Actor.java
Merge remote-tracking branch 'origin/networking' into ai