controllers
controllers
fixed logout route
fixed merge conflict in layout
Merge pull request #30 from darrelljones13/associations

Associations