works for me
Merge branch 'master' of github.com:AppBridge/crypt

Conflicts:
	cbc.pl