moved songs-index to index erb
merged generator.rb changes