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

Conflicts:
	.DS_Store
	EGT/EGT.userprefs
	EGT_Classes/bin/Debug/EGT_Classes.dll.mdb