First commit
Merge branch 'master' of https://github.com/liuhongze/pick

Conflicts:
	.gitignore
First commit