labeled the colors I'm using in the Sass lists
added logo to the "whoami" slide
Merge branch 'refs/heads/master' into gh-pages

Conflicts:
	index.html
Merge branch 'master' into gh-pages

Conflicts:
	demo/src/sass/_navigation.scss