Edits
Merge branch 'master' of https://github.com/dezkareid/somechat

Conflicts:
	templates/contact.html
	templates/cuentas.html
	templates/home.html
	templates/login.html
	templates/signup.html