Merge branch 'protosite' of https://github.com/comp1950-final-project/github into protosite

Conflicts:
	css/style.css
	html/protosite_index.html
merge conflicts

trying to sort out merge conflicts
Merge branch 'protosite' of https://github.com/comp1950-final-project/github into protosite

Conflicts:
	css/style.css
	html/protosite_index.html