whatever
Merge branch 'master' of github.com:PavelPenkov/daa_scala

Conflicts:
	src/main/scala/Digraph.scala