Merge pull request #3 from Mollydiana/gh-pages

pulling current
Merge pull request #4 from Mollydiana/master

Merge pull request #3 from Mollydiana/gh-pages