User model with password and user show page
Merge remote-tracking branch 'origin/modeling-users' into modeling-users

* origin/modeling-users:
  AddPasswordToUsers

Conflicts:
	.idea/workspace.xml
	app/models/user.rb
	db/schema.rb
	spec/models/user_spec.rb