hf102 commit
Merge branch 'dev' of https://github.com/matt-e-king/testing-git into dev

Conflicts:
	templates/pages/index.mustache
commits
hf103 commit