some shit went on
Merge branch 'master' of https://github.com/Dracoflamme/CBC

Conflicts:
	CBR/CBRinit.m