Updates to introduction slides
Merge branch 'master' of https://github.com/menslow/voltron

Conflicts:
	index.html