test
dennis test branch
Charles test

ser du ändringen?
this sass bullshit
get rekt
Merge branch 'master' into dennistest

Conflicts:
	style/.sass-cache/4be8f21255451f1b774a7c838c07e235583131df/masterCss.scssc
commin
rekt
Some changes to price
json
Json

name, stock, cost
koala
Merge branch 'master' into Shobres-playground

Conflicts:
	index.html
	items.json
	style/masterCss.css
	style/masterCss.css.map