Adding .gitignore
README text
Merged from origin/master