updating readme conflict
Merge pull request #10 from adslaton/addev

updating readme conflict