Markdownに対応など
Merge branch 'master' of github.com:himakan/paster

Conflicts:
	app/controllers/paster_controller.rb