modified gitignore
Merge branch 'version2'