commit
merged
Merge branch 'master' of https://github.com/DenniJensen/BachelorThesis
merge
refactored