Fix requirements.txt conflict. Merge branch 'twitter'
Fix requirements.txt conflict.
Merge branch 'twitter'

Conflicts:
	lean_workbench/static/js/Funnel.js
	requirements.txt

wigginslab/lean-workbench,wigginslab/lean-workbench,wigginslab/lean-workbench,wigginslab/lean-workbench