Merge pull request #1 from ConnerHAnderson/dev

Changed readme
James Entry
Fixed merge conflict