comments
Merge branch 'master' of https://github.com/tillathahun/ddProject3

Conflicts:
	ddProject3/src/EdgeTest.java