update to readme
update to readme
remove commented out lines in the readme
fix merge conflicts in readme