update master
confict fixed
Added Gitter badge
Merge pull request #1 from gitter-badger/gitter-badge

Add a Gitter chat badge to README.md
fix confict