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

Conflicts:
	public/codekit-config.json
codekit config
Merge branch 'master' of https://github.com/allwebcafe/christmasfy-bookmarklet

Conflicts:
	public/codekit-config.json
Merge branch 'master' of https://github.com/allwebcafe/christmasfy-bookmarklet

Conflicts:
	public/js/christmasfy-bookmarklet.min.js