Updated readme with info on merging branches.