Merge branch 'master' of https://github.com/stanfordude/stanfordude.github.io

Conflicts:
	index.html
hi

hi