Fix
Fixes
Merge branch 'master' of https://github.com/propra13-orga/gruppe22

Conflicts:
	Gruppe22/Gruppe22/Mainwindow.cs