Updated 3a and 3b
Updated 3a and 3b
Merge branch 'master' of https://github.com/ncweiler/KSMResilience

Conflicts:
	splashpage.css