testing commit from thinkpad
Merge branch 'master' of https://github.com/iancarr/AeroHydro

Conflicts:
	notebooks/vortexSourcePanelMethod.py