added what I did to readme
resolving conflict in readme