Commit branch 1
Added gitignore
Merge branch 'branch1'