updates readme with latest todos and dones
merges conflicts