upgrade rails
Merge branch 'master' of github.com:blaedj/FuzzySampleApp
update rails and gemfile