Content updates
no message
no message
Merge branch 'content' into gh-pages

Conflicts:
	dist/scripts/hackathon-portal.js
	dist/scripts/hackathon-portal.min.js