modified:   .gitignore
Merge branch 'master' of https://github.com/lanmower/gong

Conflicts:
	.gitignore