Change background color to grey
Merge branch 'feature_2' into dev

Conflicts:
	git101_stylesheet.css