bla
Merge remote-tracking branch 'origin/master'

Conflicts:
	snacka.html
	snacka.js