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

Conflicts:
	_site/groups/index.html
	_site/resources/index.html
	resources.html

Added the _site folder to the gitignore list