Update .gitignore & README.md
Merge branch 'master' of github.com:derekbarber/enegotiation