Invite friends functionality working
Mergeing facebook friend invite feature to app

Merge branch 'master' into feature/facebook_friends
Merge pull request #2 from Onaracs/feature/facebook_friends

Feature/facebook friends
unfollow button working properly
deleted relationship create/destroy pages... not needed
Merge pull request #3 from Onaracs/feature/facebook_friends

Feature/facebook friends
working on follow/unfollow ajax, merging with everyones work
Merge pull request #4 from Onaracs/feature/facebook_friends

working on follow/unfollow ajax, merging with everyones work
Fixed merge conflicts in:
  - users/index.html.erb
  - layouts/application.html.erb
  - controllers/relationships_controller.rb

Merge branch 'master' of https://github.com/Onaracs/encore

Conflicts:
	app/assets/javascripts/users.js
	app/controllers/relationships_controller.rb
	app/views/layouts/application.html.erb
	app/views/users/index.html.erb
Fixed the functionality of searching for a concert, and if the concert
is already made, going to the actual concert page rather than the 'create'
concert page
  - Code had to account for multiple concerts that can exist on the same date
    at the same venue due to festivals.
took out leftover merge conf line
Merge pull request #57 from Onaracs/master

Invite/follow/unfollow friends + go to concert page if exists
created view helpers for concert listings, created concert listing blocks
removed text outline that everyone hated, continued on concert page
Merge pull request #58 from buck3000/feature/concert-search-page-styles

Feature/concert search page styles
Add basic flagging functionality to videos
- Added column of correct to videos, default set to true
- Users can report a video
- This sets video correct attribute to false and gives the video a css class of flagged, which fades it out
- Class changing done via ajax
Add email notification functionality when videos flagged
- Set up ActionMailer class that can email admin when a video is flagged
Merge pull request #61 from tihuan/test/controllers/users_controller

Test/controllers/users controller
fix conflicts
Merge branch 'feature/flagging-videos' of https://github.com/raderj89/encore

Conflicts:
	app/assets/stylesheets/concerts.css.scss
	app/controllers/concerts_controller.rb
finished first run of youtube search page styling