Change background color to grey
Change foreground color to red
Merge branch 'feature_1'

Conflicts:
	git101_stylesheet.css