ok..git
aa
Merge branch 'master' of https://github.com/JVTrader/JTrader

Conflicts:
	src/main/webapp/WEB-INF/views/stock/SupplyAndDemand.jsp
d