added updates to tutorial

dealing with branches, detached heads, and merge issues