merge complete
Merge branch 'shona' of github.com:uxisready/uxisready.com into shona

Conflicts:
	index.js
	overrides.css