Chapter 10 midway because of loss of chapter 9
Chapter 10 - midway, adding Faker
Merge branch 'master' into user-microposts

Conflicts:
	.gitignore
	app/models/user.rb
	app/views/layouts/_header.html.erb
	db/schema.rb
	faker
	lib/tasks/sample_data.rake
	spec/factories.rb
	spec/requests/user_pages_spec.rb
Chapter 10: Add user microposts