Commit before pull. Woring on HttpResonseRedirect after vote on Lifeskills surveys
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	sunstreet/templates/botvin/displayquestions.html
Commit before merge
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	botvin_lifeskills/urls.py
	botvin_lifeskills/views.py
	sunstreet/templates/botvin/displayquestions.html
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet
Harcode botvin redirect url's?