git_intro - merge c with master