Rectangles
Merge branch 'master' of https://github.com/amaldini/TradingSimulator

Conflicts:
	src/TradingSimulator/TradingSimulator.form
	src/TradingSimulator/TradingSimulator.java