added my name to readme
resolve merge conflict in README