Merge branch 'master' of https://github.com/inmagination/YaketyYak

Conflicts:
	php/registro.html
arreglado
Merge branch 'master' of https://github.com/inmagination/YaketyYak