Update README.md

fixed mistake
Merge pull request #296 from cloudaice/patch-1

Update README.md
feat(README): add link to trello
Merge pull request #297 from philips/add-trello

feat(README): add link to trello
chore(CONTRIBUTING): make the allowed types a list

The list was formatted as one long sentence. Fix that.
Merge branch 'master' of https://github.com/benbjohnson/etcd into benbjohnson-master

Conflicts:
	README.md
fix(README): cleanup a bad merge
feat(README): add an erlang library marshall-lee/etcd.erl
Merge pull request #305 from philips/cherry-pick-lost-changes

feat(README): add an erlang library marshall-lee/etcd.erl