test
Merge branch 'master' of github.com:SocaDB/Celo

Conflicts:
	src/Celo/System/Buffer.h