Add 2nd news item to index page
Add article for 2nd news item
Create the about page
Begin creating bio pages
Add link to about section in home page
Add red page
Add yellow page
Add green page
Add bio page for Mary
Merge branch 'master' of https://github.com/AschaleS/my-git-repo

Conflicts:
	about/index.html
	about/me.html
	index.html
	news-2.html