modify in dir1
Merge branch 'master' of https://github.com/criswonder/gitlearn

Conflicts:
	README
	README~