fixed html typos in card and layout erb
fixed merge conflicts
wrapped add to collection button in an current user if statement
Merge pull request #95 from darrelljones13/fix-typos

fixed html typos in card and layout erb