don't know
Merge branch 'master' of https://github.com/cestastanford/hdlab-web

Conflicts:
	_config.yml
	_site/feed.xml
	_site/index.html
	_site/lab-notebook/index.html
	_site/lab-notebook/palladio/atom.xml
	_site/lab-notebook/palladio/index.html
	_site/projects/palladio/index.html
	lab-notebook/index.md