Finished Diamond
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ch.6 Practice/Diamond.java
	Ch.6 Practice/package.bluej