Initial set up
Merge pull request #1 from MarelBrinkman/initial-set-up

Initial set up