Changed .gitignore
Create README.md
Merge remote-tracking branch 'upstream/master'