Updated requirements- django social auth
Facebook django
Merge branch 'master' of github.com:txsl/hackEdu

Conflicts:
	requirements.txt