admin
dinner edit
Merge branch 'master' of github.com:netguru/slaska

Conflicts:
	app/views/layouts/application.html.haml