story:show,createレイアウトの修正
Merge branch 'master' of https://github.com/kuntao/taskeyOnRails
story/newのレイアウトの変更：タグの追加
Merge branch 'master' of https://github.com/kuntao/taskeyOnRails

Conflicts:
	app/views/stories/new.html.erb