Merge branch 'Yoshua'
codekit
Merge branch 'master' of https://github.com/yoshuadiaz/Landing-KMS

Conflicts:
	config.codekit