The day's work.
Merge branch 'master' of https://github.com/bluetomatoes/TEDxYYC-Wordpress-Theme

Conflicts:
	css/style.css
	header.php
	js/script.js