changed a few things
Merge branch 'master' of https://github.com/Isaisaisa/BWL2-
bla
Merge branch 'master' of https://github.com/Isaisaisa/BWL2-

Conflicts:
	Shop/app/views/produkts/_form.html.erb