updated content
Merge branch 'content' of github.com:allmende/allmende.github.io into content