implemented separate concern for facebook and twitter
Merge branch 'master' of ssh://github.com/tommyadey/aries
fixed merge conflicts