...
Merge branch 'master' of https://github.com/Benur/ICG_WS12.git

Conflicts:
	src/graph/DefaultApp.java