Merge pull request #22 from milanij/jamesbranch

fixes the friend problem. adds in mercury and it's working on the versio...
more tests and passing tests, yay
Merge branch 'master' of https://github.com/milanij/writerShareApp into jamesbranch