this is right
Merge branch 'master' of https://github.com/criswonder/gitlearn

merge conflict

Conflicts:
	README
	README~