Add functionality of followers and following
  - Still need to fix button to unfollow
  - User pages now display all of their followers and who they are
    following
working on inviting facebook friends
Merge pull request #34 from tihuan/feature/store_concerts_in_search_page

Feature/store concerts in search page and display videos by setlist order
Fix merge conflicts

Merge branch 'Onaracs-feature/facebook_friends'
Fixed merge conflict in schema.rb

Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb
update search controller and add default values to venue
Add basic pagination
- displaying the 20 results from setlistfm for now
fix conflicts
Merge branch 'raderj89-feature/paginate-setlist'
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
fix conflicts
Merge branch 'tihuan-feature/store_concerts_in_search_page'
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
housekeeping
solve merge conflict again