sync
Merge branch 'master' of https://github.com/talensjr/juegos

Conflicts:
.gitignore
app/views/login.blade.php
public/img/recoge-tu-cuarto/panuelo.png
resolviendo conflictos

cruzando los dedos