week 4 start
Merge branch 'master' of github.com:/kenbarbour/csc230-notes

Conflicts:
	4-type_conversions.txt