more user creation stuff
Merge branch 'master' of https://github.com/tfang2017/winterproject

Conflicts:
	tutorBase/views.py