Merge branch 'master' of github.com:sf-railsbridge-study-group-2014/the-long-road