work in progress
Merge branch 'viva' into gh-pages

Conflicts:
	css/presentation.css
	index.html