add, hello
Merge branch 'feature/function1' into develop