Merging two branches

Merging

two branches

branch with changes
to be applied
git
merge
source
target
command to
join branches
branch that should
receive the changes

#049

@jtemporal