title: How do I merge a branch into a master in github?
body: <p>I created a repo and github, and pushed my files to it. Then had a colleague create a branch and make changes. I want to merge the branch to master.</p>
  
  <p>What steps do I take?</p>