got rid of weird conflicts?
Merge pull request #16 from jimothy001/james

got rid of weird conflicts?