first commit
Merge https://github.com/armid/armid.org