readme changes to go to the fork
fixed merge conflict properly
i made changes to README too
Merge pull request #2 from jg485/master

accept this request!