modified README.md
new file aaa.txt
rename aaa.txt to abc.txt
rename abc.txt to bbb.txt
commit without add operation
Merge branch 'master' of github.com:zjmean/jimmy
Conflicts:
	README.md