First commit
Merge github.com:houjieth/MyGreper

Conflicts:
	README.md