Ignore
Merge

Conflicts:
	codekit-config.json