WIP combine hidden_form data with song list
Successfully store video identifiers in model: ConcertSong
delete comments in js
delete comments in js again
resolve conflicts
update two files from Onaracs/encore_rails
before merge to fork_master
resolve conflicts
clean up pages.js
Merge branch 'master' of https://github.com/tihuan/encore
fix pages.js to accommodate drop-down song menu
housekeeping
Delete 20140522193915_create_concert_songs.rb
Delete 20140522193915_create_concert_songs.rb

Unused migration file. Delete to avoid merge conflict.
template of user page complete,  waiting on users to have concerts
Merge pull request #6 from Onaracs/feature/user_page

template of user page complete,  waiting on users to have concerts
Merge pull request #7 from raderj89/master

beginning pagination feature - modifying tests as I go
backup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/pages_controller.rb
	db/migrate/20140524190644_create_concert_songs.rb
	db/schema.rb
	spec/features/pages_spec.rb
Merge branch 'master' of https://github.com/tihuan/encore