small changes
Merge branch 'gulp' of github.com:aino/kokplatta into gulp
err