Changing the background color.
Resolving a conflict for the body background color.
Merge branch 'master' of https://github.com/ilrDrupalTraining/trainingtest

Conflicts:
	styles.css