Merge branch 'Yoshua'
Merge branch 'master' into Yoshua
codekit
Merge pull request #3 from yoshuadiaz/Sinhue

Sinhue
Actualización de URL POST en formulario de Login.
Merge branch 'master' of https://github.com/yoshuadiaz/Landing-KMS

Conflicts:
	app.html
	comofunciona.html
	index.html
	kit/footer.kit
	pulsera.html
	team.html
termino y condiciones
codekit
Merge branch 'master' of https://github.com/yoshuadiaz/Landing-KMS

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

Conflicts:
	config.codekit
Cambios sanos css
Merge branch 'Yoshua' into staging