Make a basic User model (including secure passwords)
Make a basic user model
Merge branch 'sign-up'

Conflicts:
	app/models/user.rb