viewの追加
Merge branch 'master' of https://github.com/kuntao/taskeyOnRails

Conflicts:
	app/controllers/stories_controller.rb
	app/views/stories/new.html.erb
	app/views/stories/show.html.erb
	app/views/users/show.html.erb
profile_imageのコメントアウト: