Add red page
Add yellow page
Add green page
Add bio page for Mary
Add 3rd news item
Add CSS styles for headings and links
Merge branch 'master' of https://github.com/godfreym/git_tutorial

Conflicts:
	green.html
	index.html
	news-3.html
	red.html
	yellow.html