Changes on Home MachineS
Merge branch 'master' of https://github.com/bluetomatoes/TEDxYYC-Wordpress-Theme

Conflicts:
	front-page.php