Adding hpricot
Merge branch 'master' of github.com:fdv/typo
Changes in route
Update gemfile
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo
Specific changes
Gemfile
Merge branch 'master' of github.com:fdv/typo
Merge branch 'master' of github.com:fdv/typo