Friday morning update
Merge branch 'master' of https://github.com/healthhack-melb/website

Conflicts:
	config.rb