commit
addition
Merge branch 'master' of git://github.com/m0rtivius/OreTrader

Conflicts:
	src/TradeDay.java