README and .gitignore updated
Merge remote-tracking branch 'origin/master'