CSS Changes to background and text colour

CSS Changes to background and text colour
Merge branch 'development-branch'

Conflicts:
	style.css