Joining and stuff

As i said, joining and stuff.
Merge pull request #7 from zl222ag/gh-pages

Joining and stuff.