?
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2
Merge branch 'master' of https://github.com/WagnerRobert/MasterThesis2