Merge branch 'master' of https://github.com/ninefold/rubyconf_au_hub

Conflicts:
	source/scheduler.html.slim