testing commit to gthub
Merge branch 'WP4' of https://192.168.1.200:8443/r/cambridge-casual.com into WP4

Conflicts:
	wp-content/themes/cambridge_desktop/library/css/style.css