Update readme
fixed conflict
Merge pull request #3 from scopatz/master

Update readme