work
Merge branch 'master' of github.com:core-code/CoreLib

Conflicts:
	CoreLib.h