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
began adding google freebase search
google freebase search working correctly
Merge pull request #12 from Onaracs/master

Freebase, Facebook login, etc.