sessions controller
songs controller end of file
Merge branch 'master' of github.com:brittlewis12/batman
fixing conflict
all controllers created, and removed unnecessary join table in the schema
fix merge conflicts, spacing quirks; fix activerecord relationships between users and songs