Pretestuservote view done.
Merge branch 'master' of github.com:dcarrot2/DjangoSunstreet

Conflicts:
	lifeskills/views.py