attempt to pull again
fixed merge conflict
Merge branch 'master' of github.com:NicholasJay/cardMe
Merge branch 'master' of github.com:NicholasJay/cardMe
Add Button when logged in working
Merge branch 'master' of https://github.com/NicholasJay/cardMe
user can delete connection(shared card) from rolodex
Merge pull request #40 from dmitryjum/master

User can delete connection(card) from rolodex
view page for cards
merge conflicts
Merge branch 'master' of github.com:NicholasJay/cardMe
fixed merge conflicts
merge conflict style.css file
dashboard
Merged stylesheets from Sandy
Merge branch 'master' of github.com:NicholasJay/cardMe
styling dashboard fixes