change to octocat
Merge branch 'master' of https://github.com/kzhao32/test

Conflicts:
	mymerge.txt