Log eliminado
Mserge branch 'master' of https://github.com/israelantezana/yosistemas

Conflicts:
	db/development.sqlite3