del all in master
Merge branch 'new'
add f2 in master
Merge branch 'master' of github.com:renyi-github/test into new