replace comment with picture
fix design
Merge branch 'master' of github.com:blp1526/konjaku

Conflicts:
	app/views/articles/show.html.erb