as
Merge branch 'gh-pages' of https://github.com/cjhlofstrom/cjlofstrom into gh-pages

Conflicts:
	includes/aah.html
	includes/ceas.html
	pro1.html