stash dev
merge no-ff
branch bug new
Merge branch 'new'
branch dev
merge master
Merge branch 'dev'
add new1
add new2
Merge branch 'new1'
Merge branch 'new2'
add gitnore