Editing james line
Merge branch 'master' of https://github.com/James-Hawkins/EPT-Biosight

Conflicts:
	TestFile.gms