DDD
Merge branch 'master' of https://github.com/Talith/ddProject1.git

Conflicts:
	ddProject1/src/ddProject1/Trading.java