Merge pull request #74 from tihuan/feature/concert_photos

concert photos link to large imgs
Merge pull request #76 from tihuan/feature/video_box

Feature/video box
started work on the users page
reshaped html for concert show page and added setlist to concert show page. styled add to concert button
minor css changes to user show page
fixed css and merge conflict
fix conflicts in gemfile and users show page
Merge branch 'Onaracs-master'
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
fixed homepage
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
add css and html back to bring back video box function
highlight working