jlj
Merge branch 'master' of https://github.com/colbymk/CODE

Conflicts:
	EGT/EGT.userprefs