Merge branch 'master' of https://github.com/ncweiler/KSMResilience

Conflicts:
	splashpage.css