1111
Merge branch 'master' of https://github.com/juanktek/UmbroTarjetaRoja

Conflicts:
	index.html
	js/auth.js
	js/index.js
	js/requests.js