config
Merge branch 'master' of github.com:sandergarretsen/novy

Conflicts:
	app/views/layouts/admin.html.haml
admin layout