Site content updates
Merge branch 'master' of https://github.com/bartschelfhout/hackathon