Laptop Commit
Merge branch 'master' of https://github.com/bluetomatoes/TEDxYYC-Wordpress-Theme

Conflicts:
	header.php