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
searches_controller has 95% coverage. Don't know how to test private methods
songs_controller spec now 100%
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
clean ps
Add email notification functionality when videos flagged
- Set up ActionMailer class that can email admin when a video is flagged
update users_controller spec to reach 100% coverage
Merge pull request #61 from tihuan/test/controllers/users_controller

Test/controllers/users controller
remove debugging code
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
fixed bug in concerts.css.scss
Merge pull request #63 from buck3000/feature/concert-search-page-styles

finished first run of youtube search page styling
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
Fix rspec tests
- remove tests no longer being used, such as video identifier attribute on concert_songs
- modify tests in accordance to Buck's styling changes
Merge pull request #64 from raderj89/master

Fix rspec tests
fixed bug in concerts.css.scss
fix conflicts