Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages

Conflicts:
	index.html
a
Merge branch 'master' into gh-pages
merge
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
yamm styles
test
a
a
a
a
a
a
a
a
a
a
a