Merge branch 'master' into version_1
Merge branch 'master' into version_1
try to push to upstream repo
delete readme upstream file
add readme.txt to master
new from old file
add a new ignore file
ignore the git ignore
add the ignore file again
Merge branch 'master' into version_1