sqlite3
Merge branch 'master' of https://github.com/Chairez/blog

# By Chairez
# Via Chairez
* 'master' of https://github.com/Chairez/blog:
  deploy working
  eliminar articulo prueba de aceptación

Conflicts:
	db/development.sqlite3