Trying to deploy to paas - messing with requirements & stackato
still trying to deploy on stackato
Merge branch 'master' of github.com:mozilla/relmandash

Conflicts:
	requirements.txt