More updates
Merge branch 'master' of https://github.com/adamjaffe/adamjaffe.github.io

Conflicts:
	stylesheet.css