asawde
Merge branch 'master' of https://github.com/harrybui22/Cogs187InfoArchitecture
contact
Merge branch 'master' of https://github.com/harrybui22/Cogs187InfoArchitecture

Conflicts:
	Website/alumni.html
	Website/community.html
	Website/css/mystyles.css
	Website/faculty.html
	Website/students.html