pre pull
Merge branch 'master' of https://github.com/katke/farmar-rails
Styled search page