the current working version of demo and moodSlider
working on the merge
pushing current working version
current working version
small changes to the css for demo
Merge branch 'master' of https://github.com/ssunier/hack-mental-health

Conflicts:
	hack_health/hack_health/settings.pyc
	hack_health/hack_health/urls.pyc
	hack_health/health/models.pyc
	hack_health/health/urls.pyc
	hack_health/health/views.pyc
pushing current db
Merge branch 'master' of https://github.com/ssunier/hack-mental-health