merge origin/branch
Section 2 over
add .gitignore