Changed in view logic to in controller
Delete ruby block
Merge pull request #6 from alice345/5-move-logic-to-view

Changed in view logic to in controller
Merge branch 'master' of https://github.com/terakoya/marksman
Merge branch 'master' into feature/add_comment

Conflicts:
	app/controllers/articles_controller.rb