Correccion de errores sintacticos
Merge branch 'master' of https://github.com/Tebitan/USACHatRoulette
Correccion ingreso usuario sin nick
Merge branch 'master' of https://github.com/Tebitan/USACHatRoulette

Conflicts:
	views/index.html
Intentando solucionar conflicto
Intentando solucionar conflicto
Merge branch 'master' of https://github.com/Tebitan/USACHatRoulette

Conflicts:
	views/index.html
Detalle menor