Retomando o Projeto - Ferias
asdad
Merge branch 'master' of https://github.com/saraivaufc/AskMath

Conflicts:
	db.sqlite3
	matbasica/__init__.pyc
	matbasica/admin.pyc
	matbasica/models.pyc
	matbasica/views.pyc
	sisport/__init__.pyc
	sisport/settings.pyc
	sisport/urls.pyc
	sisport/wsgi.pyc