comment out bootstrap-responsive
Merge branch 'songs'
update gemfile