Revert e09b701..08638e7

This rolls back to commit e09b70145d9fcc4a9c43d5716274704e829a209f.
Revert "jackie - resolve conflict"

Conflicts:
	cw_master/home.html