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
Merge branch 'gh-pages' of https://github.com/gory/united into gh-pages

Conflicts:
	dist/index.html