Stupid Codekit config file.
Merge branch 'master' of https://github.com/allwebcafe/christmasfy-bookmarklet

Conflicts:
	public/codekit-config.json