first commit
Merge branch 'gh-pages' of https://github.com/wondereamer/Wiki
2