changes
fixing merge conflict
updated the readme
updated the readme some more
Changed one word in readme...
Merge pull request #1 from stevenmiller888/master

updated the readme