Merge pull request #43 from raderj89/master

fix conflicts
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
fixed search controller bug on song query