first commit
Updating directories.
Merge https://github.com/abvanpelt/diaspora