Merge pull request #1 from gory/master

added dist folder for github.io
dist folder
Merge branch 'gh-pages' of https://github.com/gory/united into gh-pages

Conflicts:
dist/index.html
Merge branch 'gh-pages' of https://github.com/gory/united into gh-pages

Conflicts:
	dist/index.html
Delete index.html
Merge branch 'gh-pages' of https://github.com/gory/united into gh-pages

Conflicts:
	dist/index.html
dist/index.html
Merge pull request #2 from gory/gh-pages

merge into master