add josh to read me
merge resoulution