what
Merge branch 'development' of https://github.com/MikeTYChen/EPICStartupCareerFair into development

Conflicts:
	index.html
	stylesheets/style.css