small changes
added files
adding teh new page
stil working on it
starting chapter 9
done 9.1
saving stuff
added files
still working
adding stuff
doin stuf
saving before merging
Merge branch 'updating-users'

Conflicts:
	lib/tasks/sample_data.rake
Merge branch 'user-micropost'

Conflicts:
	Gemfile
	app/controllers/users_controller.rb
	db/schema.rb
	lib/tasks/sample_data.rake
	spec/factories.rb
	spec/models/user_spec.rb
	spec/requests/user_pages_spec.rb