Make a basic User model (including secure passwords)
merging
Merge branch 'modeling-users'

Conflicts:
	.DS_Store
Added user sign-in
getting latest
Merge branch 'sign-up'

Conflicts:
	.DS_Store
Pushing