Make a basic User model
finish user signup
Add SSL
merge in fixes
Finish sign in
Merge branch 'sign-in-out'

Conflicts:
	.idea/workspace.xml

Signed-off-by: Liz <grubbycodemonkey@gmail.com>