Changes I made during the meeting
Merge pull request #11 from LukasGalliker/master

Changes I made during the meeting