fixed conditional in the collaborators controller, and added updated songs#create so that song creator tis among the collaborators(i.e. is in the songs_users table)
Merge branch 'master' of github.com:abrahamian/batman into mihran