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