Moved (merge was not possible due to how the branch was created) the content from the "mischa" branch to the master branch.
Merge pull request #2 from barredijkstra/master

Moved the content from the "mischa" branch to the master branch