fixed small spacing quirks
fixed merge conflict in songs controller
fix merge conflicts, spacing quirks; fix activerecord relationships between users and songs
removed latest migration
fix conflict in schema and merge
dropped tables and ran migrations again
fixed erroneously changed activerecord relationships between users and songs
make seeds
Merge branch 'master' into controllers
made collaborators controller(collaborators has no model, or table. fancy that...)