Add user microposts
Merge branch 'user-microposts'

Conflicts:
	rails_projects/sample_app/app/views/users/edit.html.erb
	rails_projects/sample_app/spec/models/user_spec.rb
	rails_projects/sample_app/spec/requests/authentication_pages_spec.rb