First commit.
fixed conflict
Merge pull request #14 from permag/gh-pages

Joining. Phase 0.