random changes
merge conflicts resolved
minor edit in README