2nd commit
Merge branch 'add-function'
added gitignore
Merge branch 'master' into add-function
Merge branch 'add-function'