rettig's changes
adding back in os change
Merge branch 'pono/daycamp/session2'

Conflicts:
	source/daycamp_introtrack_session2.rst