ultima alteração
Merge
Merge branch 'master' of github.com:rodrigolucianocosta/Relationship-

Conflicts:
	relationship/academy/models.pyc
	relationship/db.sqlite3
entrega de trabalho concluido