fix misspelling
Merge branch 'master' of github.com:yangtheman/railsconf_2014
Merge branch 'master' into gh-pages