test2511
Merge branch 'master' of https://github.com/kraemerc/siterepo

Conflicts:
	_config.yml
	contact.html
	index.html
	services.html
test2
commit 251114
commit 251114
commit 251114
Merged siterepo from kraemerc