made fixes, the ./song in main needed to be below require sinatra
fixed merge issues and bug fix