Added stuff regarding branching and merging

ADD: extra features
EDIT: readme to reflect branching/merging