gitignore
Merge branch 'master' of https://github.com/51weekend/dingcan

Conflicts:
	dingcan.sublime-workspace