-
Merge branch 'master' of https://github.com/huilen/blackcherry

Conflicts:
	blackcherry.py