Merge branch 'draft'
Merge branch 'draft'
Just pushing out some new photos/emails/smaller header.
Merge branch 'master' into draft

Conflicts:
	_data/slides.yml
	css/main.css