Added fingerpaint
added speaker company logos
nav added
Merge branch 'gh-pages' into careful

Conflicts:
	_includes/javascripts.html
	_includes/masthead.html
	_layouts/default.html
	index.html
	js/app.js
Renamed button