started work on the users page
minor css changes to user show page
housekeeping
fix conflicts in gemfile and users show page
Merge branch 'Onaracs-master'
update show page to include concert-show-setlist in setlist
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore into merge_video_box
Merge pull request #78 from tihuan/merge_video_box

Merge video box
Merge branch 'chore/edit-html-and-css-for-concert-show' of https://github.com/buck3000/encore into buck3000-chore/edit-html-and-css-for-concert-show
Merge branch 'buck3000-chore/edit-html-and-css-for-concert-show'
fix conflicts on show page
resolved merge conflict