README
Merge branch 'master' of github.com:weheartit/crystal

Conflicts:
  README.md