merge branchs
merge with no-ff
commit .gitignore