list remote branches
Merge branch 'master' into macbookair

* master:
  list remote branches