pages_controller - 20 examples 92.81%
Merge pull request #13 from tihuan/test/pages_controller_spec

pages_controller - 20 examples 92.81%
Add js back to layouts/application.html.erb
Merge pull request #14 from tihuan/master

Add js back to layouts/application.html.erb
Began model testing for:
  - Concerts
  - Venues
  - Concert_songs
Friendly test environment setup complete
Merge pull request #15 from tihuan/chore/setup_test_suite

Friendly test environment setup complete
Beginning adding song videos to concert
- Beginning feature tests
- Set up ajax support in tests
fix conflict
deleted home route from routes.rb - no longer in use
Add song videos via ajax
- adding songs with appropriate relations functional
- need to modify tests broken by data persistence changes
Merge pull request #16 from raderj89/chore/save-songs

Chore/save songs
Added concert show page
  - Branch named model/validations
  - Showing artist, venue, YT videos, and setlist
  - Still working on CSS and getting Twitter Bootstrap to work
  - Button functionality still needs to be added to add concert to a user
    page
Merge branch 'Onaracs-task/model_validations'
fix conflict
Merge branch 'Onaracs-master'
Merge pull request #18 from Onaracs/master

Added concert show page
merge upstream
Merge branch 'master' of https://github.com/fiddler-crabs-2014/encore
pages_controller_spec all working again