Veelluiken modified
Merge branch 'master' of https://github.com/omnivoor/exhibitionist

Conflicts:
	cache.manifest