init
Merge branch 'master' of https://github.com/jcpwfloi/cboj

Conflicts:
	.gitignore