about page is broken. cant add new items
Merge branch 'master' of https://github.com/titse/COGS187GROUP

Conflicts:
	about.html