merge

merge
Merge branch 'master' of https://github.com/jvanzummeren/vertragings-app