Fixing problems with code transfer
Merge remote-tracking branch 'origin/master'

Conflicts:
	DrawGraph.java