Changes from lectures
Merge branch 'master' of github.com:lrhgit/tkt4140

Conflicts:
	Kap5/1dheatObj.py