shell script made by me
Merge branch 'new2'