add secure password
Merge branch 'password'

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	db/schema.rb

adding password