some revision recently
Merge branch 'master' of https://github.com/lunzhy/PySimFig

Merge branch from Workstation
Conflicts:
	.gitignore