Merge branch 'master' of https://github.com/jjccc/mathalarm
Añadir database.yml al gitignore
Merge branch 'master' of https://github.com/jjccc/mathalarm