didn't do anything
Merge branch 'master' of github.com:gglin/playlister-rails

Conflicts:
	Capfile
	Gemfile
	config/deploy.rb
Merge branch 'master' of github.com:gglin/playlister-rails
beginning fancybox work
sdlfkja
modal working! for individual songs
modal working for videos who are in seed file?
made fancybox show up on song page and playlist page
Merge branch 'master' of github.com:gglin/playlister-rails