category up
Merge branch 'master' of https://github.com/Dammmien/55-hackaton

Conflicts:
	js/partials/category.html
detail view, routing ok