some steps in the tdd direction
Merge branch 'master' of https://github.com/sulami/peerwire_pm