123
Merge branch 'master' of github.com:shov/binkit

Conflicts:
	README