many commits
Merge branch 'gh-pages' of https://github.com/opetchey/emeh into gh-pages

Conflicts:
	groups.html
	resources.html