working on merging user branch
Merge pull request #1 from Onaracs/feature/user_page

template of user page complete,  waiting on users to have concerts
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
Merge branch 'master' of https://github.com/Onaracs/encore
Merge pull request #8 from tihuan/master

Merge to patch Fid Master
began adding google freebase search
testing user signup and controller - having trouble with testing controller sign in
16 exmaples 92.55%
video search page now two columns with setlist on right
google freebase search working correctly
Add user sign up, sign out tests and sessions controller tests
- Having a problem testing sessions controller and facebook omniauth
- Added email column to users table as we'll want to store emails
Merge pull request #10 from raderj89/chore/layout-tweaks

video search page now two columns with setlist on right
Merge pull request #11 from raderj89/user-tests

User tests
Merge pull request #9 from tihuan/test/pages_controller_spec

16 exmaples 92.55%
Merge pull request #12 from Onaracs/master

Freebase, Facebook login, etc.
pages_controller - 20 examples 92.81%
Merge pull request #13 from tihuan/test/pages_controller_spec

pages_controller - 20 examples 92.81%