Add red page
Add yellow page
Add green page
Add bio page for Mary
Add 3rd news item
Merge remote-tracking branch 'origin/master'

Conflicts:
	green.html
	index.html
	red.html
	yellow.html