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

update website
Merge branch 'gh-pages' of https://github.com/m3xm/m3xm.github.io into gh-pages
map margin
typo fix
Merge pull request #3 from m3xm/gh-pages

Updating