merge file
dev branch
branch master
merge master dev
branch dev
Merge branch 'dev'
branch dev 3
master 10
master 11
dev 12
dev 13
Merge branch 'dev'
add .gitignore
modifiey .gitignore