README edit
Merge pull request #1 from chucknado/docs

README edit
Fix conflict
Resolve conflict