config
Merge branch 'master' of github.com:nicolasfranck/OpeningsUren into week

Conflicts:
	catmandu.yml.default