twitter app
Merge remote-tracking branch 'upstream/master'

Conflicts:
	requirements.txt
twitter app funcionando
correct settings django-decouple
Merge pull request #38 from raonyguimaraes/master

Twitter App