Initial import.
Initial commit
Merge remote-tracking branch 'remotes/github/master'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/weijia/approot

Conflicts:
	.gitignore
	README.md