prueba.txt
mv db and create templates folder
Merge branch 'master' into dev