added myself to README
fixing merge conflict