Merge branch 'gh-pages' of https://github.com/acm-uiuc/icpc-website into gh-pages

Conflicts:
	_data/message.yml
	_includes/navbar.html
	index.html