to Mid Chapter 10
Chapter 10 partial
Merge branch 'user-microposts'

Conflicts:
	app/controllers/users_controller.rb
	app/models/micropost.rb
	app/models/user.rb
	db/migrate/20131119012444_create_microposts.rb
	lib/tasks/sample_data.rake
	spec/factories.rb
	spec/models/micropost_spec.rb
	spec/models/user_spec.rb
small change
Add user microposts
Merge branch 'user-microposts'