completed
merge
modify gitignore