rails 4
Merge branch 'master' of github.com:wangfowen/hellaroadtrip-web
commit attempt