Conflicts:
	Gemfile.lock
	app/assets/javascripts/lib/mod-md-editor.js.coffee
	app/controllers/posts_controller.rb
	app/views/posts/_form.html.slim