do it now
Merge branch 'master' of https://github.com/zmwuqi/Bark

Conflicts:
	.idea/workspace.xml