Merged README.md and .gitignore from master