added my name to readme
resolve merge conflict in README
Merge remote-tracking branch 'upstream/master'