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

Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb
Adding conflict user.rb