COdekit
COdekit otra vez
Merge branch 'master' into Yoshua

Conflicts:
	config.codekit
Merge branch 'master' into Yoshua

Conflicts:
	config.codekit
Merge remote-tracking branch 'origin/Yoshua'

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