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
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
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
fix conflict
Merge branch 'Onaracs-master'