stash test
stash test 2
Merge branch 'master' into dev
delete nohuo.out
update log output
gitignore ~ file
Merge branch 'master' of github.com:MingSay/mana