add function 3
add function 4
Merge branch 'fun4' into fun3
add function 5
Merge branch 'fun3' into fun5