readme
Merge branch 'master' of github.com:arlogn/diaspora-universe