Update README
Merge branch 'master' of https://github.com/hascoulijn/boilerplate

Conflicts:
	README.md