OK
Merge branch 'master' of https://github.com/markm11/plcscorlib

Conflicts:
	core.stack.cpp
	core.stack.h