Merged Song Class + Tests file to master