no message
Merge branch 'master' of https://github.com/johvir/Grupp2

Conflicts:
	grupp_arbete/admin/css/admin.css