background a 100%
Merge remote-tracking branch 'origin/master'

Conflicts:
	killkat.js
encodeBase64