commit for merge
Merge branch 'master' of https://github.com/bergs13/ch.bfh.bti7301.hs13.team1.graphviewer.git
commit for merge
commit 2
Revert "commit 2"

This reverts commit 5c1990e45b2d567a41d0a83b10b2872a5e200620.
Revert "commit for merge"

This reverts commit db7e41ea09ca4e54863b54550170276059f7abf9.
Merge branch 'master' of https://github.com/bergs13/ch.bfh.bti7301.hs13.team1.graphviewer.git
intermediate state