test reset function
Merge branch 'github'
delete two files after merge with branch github