Changes
Merge branch 'master' of https://github.com/brwr/thinkster-django-angular

Conflicts:
	requirements.txt
Fix requirements