Merge pull request #1 from nuhuxi/master

sending changes to the production page
Merge pull request #2 from nuhuxi/gh-pages

Merge pull request #1 from nuhuxi/master