codekit confict
Merge branch 'master' of https://github.com/avidas/Connecther-donate

Conflicts:
	config.codekit