Merge branch 'master' into gh-pages
Merge pull request #2 from Maccrafter/master

for a better look
Merge pull request #3 from Maccrafter/gh-pages

update ge-pages