Updated Todo and updated genre.html.erb
Updated url methods to escape apostrophes
lib/templates/song.html.erb
Fixed bug in song html.erb
Completed pages erb
Merge branch 'snickers' into KevinC
got rid of escaping apostrophes for now and just strips it out
Merge branch 'snickers' into KevinC