Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
housekeeping
solve merge conflict again
solve merge conflict
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
Merge branch 'test/controllers/searches_controller'
fix/searches_controller
fix/searches_controller again
Merge Buck's stylings into existing code
- modified concert listings pagination - removed jquery rendering of concerts
Merge pull request #44 from raderj89/chore/merge-new-stylings

Merge Buck's stylings into existing code
resolve conflict
searches_controller tests all pass: