cambios en css, se agrega database.json
Merge branch 'master' of https://github.com/aether7/camereida

Conflicts:
	templates/index.html