Update README.md
Merge remote-tracking branch 'github-pr/pr/3' into incoming

Fix conflicts.
[auto] Merge from Zombie

    • #6c0cf3a — Update README.md (flip111, 2014-03-27)
    • #010fd61 — Merge remote-tracking branch 'github-pr/pr/3' into incoming (Ivan Enderlin, 2014-03-28)

---

Merge branch 'master' of /var/lib/git/repositories/Library/Zombie