aaa
Merge branch 'master' of github.com:edrun/Mynote

Conflicts:
	gTool
	gpack
	work.sh