started on new song controller.  didn't do model yet
fixed conflicts in item show.html