ruby mine
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/posts/new.html.erb
ruby mine