Migrating to Git and GitHub

Merge remote branches