dan's changes
Merge branch 'master' of https://github.com/danielfrance/CSSgroup2

Conflicts:
	style.css