Shouldn't be in git
Merge pull request #4 from basvodde/master

This shouldn't be in git