Database
Merge branch 'master' of https://github.com/cargalo/web_application

Conflicts:
	cargalo/db.sqlite3
Merge branch 'master' of https://github.com/cargalo/web_application

Conflicts:
	cargalo/db.sqlite3