couple of small changes
Merge branch 'lea/workshop_branch' of https://github.com/erdc-cm/proteus into lea/workshop_branch

Conflicts:
	src/LinearAlgebraTools.py