Updated Todo and updated genre.html.erb
Updated url methods to escape apostrophes
update make_artist_index! method
lib/templates/song.html.erb
Fixed bug in song html.erb
Completed pages erb
Merge branch 'snickers' into KevinC
Merge branch 'snickers' of github.com:FifthSurprise/playlister-generator-ruby-004 into denikov
Update artist index
got rid of escaping apostrophes for now and just strips it out
Merge branch 'snickers' into KevinC
fixed merge conflict