wesley's slides
Merge branch 'wesley-slides'

Conflicts:
	index.html