auth
auth
Merge branch 'master' of https://github.com/qs/crowd-predict

Conflicts:
	crowd-predict/app.py