edit git ignore
edit gitignore
fixed conflict
edit README.md for archiv
edit README.md
edit README.md
Merge branch 'dev'