test
Merge branch 'master' of https://github.com/tolkjen/CPOO
Merge branch 'master' of https://github.com/tolkjen/CPOO

Conflicts:
	src/bmodel.cpp
Merge branch 'codebook' of https://github.com/qermit/CPOO
Fixed headers