argh
Merge branch 'master' of https://github.com/feider/btoc

Conflicts:
	btoc
c