commit
Merge branch 'master' of https://github.com/yezhiming/atom-butterfly

Conflicts:
	package.json