Finish user model
Updating users 4
foo
EOC9
EOC92
EOC92
Add user microposts
Merge branch 'user-microposts'

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/views/users/edit.html.erb
	db/schema.rb
	lib/tasks/sample_data.rake
	spec/factories.rb
	spec/models/user_spec.rb
	spec/requests/authentication_pages_spec.rb
	spec/requests/user_pages_spec.rb
	spec/support/utilities.rb