Prepared for combined setup between lab0 and start of workshop
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Prepared for combined setup between lab0 and start of workshop