something weird
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Graph.class
	graphOutput.dot
	src/Graph.java