1
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/micropost.rb
	config/routes.rb