Ignore file with ~
Delete README.md~
Update README.md
Merge remote-tracking branch 'upstream/master'