remove cron
test git
remove test.txt
test branch
test branch
on myTest branch add test.txt file
Merge branch 'myTest'
i am learning how to use git
Merge branch 'myTest'

Conflicts:
	README.md
Merge branch 'myTest' and test commit --amend

Conflicts:
	README.md
Merge branch 'master' of github.com:scarletsky/sakuramai
lalala
master push
delete haha.txt and test.txt
edit README.md
test stash
Merge branch 'hahaha'
merge hahaha and delete branch hahaha