Modify app/views/posts/show.html.erb
Fix conflict in app/views/posts/show.html.erb
Implementing in-place editing.

Merge branch 'develop' of https://github.com/guanglindu/blogplus into develop
Try in-place editing with Twitter Bootstrap