Merge pull request #2 from JadeCodes/master

Merge branch 'gh-pages'