idk
Merge branch 'amanda's-branch' of https://github.com/meghanriegel/SINC into amanda's-branch

Conflicts:
	style_aboutpage.css
LOTS!
Merge branch 'amanda's-branch' of https://github.com/meghanriegel/SINC into amanda's-branch