Add generate window
Merge branch 'master' of github.com:Slaan/GKA

Conflicts:
	bin/test_model/TestFloydWarshall.class
Finish exercise 2
Merge branch 'master' of github.com:Slaan/GKA

Conflicts:
	doc/Aufgabe 2.odt