i
	gerenciador/media/style.css
	gerenciador/media/ynxjD.png
Merge branch 'master' of https://github.com/robesson/agenda

Conflicts:
	db.sqlite3