attempt to pull again
fixed merge conflict
Merge branch 'master' of github.com:NicholasJay/cardMe
Merge branch 'master' of 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