updated README
fixing some quirky merge problems