merge readme conflict
authorHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 22 Oct 2013 12:38:59 +0000 (08:38 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 22 Oct 2013 12:38:59 +0000 (08:38 -0400)
commit41a19baa8e74de4f019f0276737457e148ab4dc2
treea5de2e00ccc59fd379822881b9007c01dbebc6ce
parentd761adf002ad324ad42c61d3da6c3961091cbcff
parent9da2921b7452204b99cd1b3e448e22735f16c751
merge readme conflict
README.md