Add rack to the gemfile.
Merge remote-tracking branch 'origin/master'