Make a basic User model (including secure passwords)
Merge branch 'master' of github.com:bchtsui/sample_app

Conflicts:
	Gemfile.lock
	app/models/user.rb
	db/schema.rb
	spec/models/user_spec.rb