Update README.md
Re-arrange show.html.erb
Merge branch 'master' of https://github.com/cicadas-2014/CitiRide-x
Merge pull request #4 from ksin/rearrange_show_html

Rearrange show html
fix merge conflict