k
Merge branch 'master' of https://github.com/maxlesser/chrome_split

Conflicts:
	background.js