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

Conflicts:
	ClassLibraryTest/ClassLibraryTest.userprefs
sf