Merge pull request #1 from Maxattax97/master

Updating gh-page
Merge branch 'gh-pages'