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

Conflicts:
	.DS_Store
	DataIO/bin/Debug/DataIO.dll
	DataIO/bin/Debug/DataIO.dll.mdb
	DataIO/obj/Debug/DataIO.dll
	DataIO/obj/Debug/DataIO.dll.mdb
	EGT/EGT.userprefs
	EGT/EGT/Program.cs
	EGT/EGT/bin/Debug/DataIO.dll
	EGT/EGT/bin/Debug/DataIO.dll.mdb
	EGT/EGT/bin/Debug/EGT.exe
	EGT/EGT/bin/Debug/EGT.exe.mdb
	EGT/EGT/bin/Debug/EGT_Classes.dll
	EGT/EGT/bin/Debug/EGT_Classes.dll.mdb
	EGT/EGT/bin/Debug/MathClasses.dll
	EGT/EGT/bin/Debug/MathClasses.dll.mdb
	EGT/EGT/obj/x86/Debug/EGT.exe
	EGT/EGT/obj/x86/Debug/EGT.exe.mdb
	EGT_Classes/bin/Debug/DataIO.dll
	EGT_Classes/bin/Debug/DataIO.dll.mdb
	EGT_Classes/bin/Debug/EGT_Classes.dll
	EGT_Classes/bin/Debug/EGT_Classes.dll.mdb
	EGT_Classes/bin/Debug/MathClasses.dll
	EGT_Classes/bin/Debug/MathClasses.dll.mdb
	EGT_Classes/obj/Debug/EGT_Classes.dll
	EGT_Classes/obj/Debug/EGT_Classes.dll.mdb
	MathClasses/bin/Debug/DataIO.dll
	MathClasses/bin/Debug/DataIO.dll.mdb
	MathClasses/bin/Debug/MathClasses.dll
	MathClasses/bin/Debug/MathClasses.dll.mdb
	MathClasses/obj/Debug/MathClasses.dll
	MathClasses/obj/Debug/MathClasses.dll.mdb