Merge branch 'gh-pages' of git@github.com:Nekocraft/map.nekocraft.com.git into gh-pages