more weird stuff
Merge branch 'master' of github.com:sim82/playground

Conflicts:
	CMakeLists.txt
testing buddy bitmap for id allocation.