MergeToMaster

1. cd into the local copy of the branch, and do a git pull
2. merge changes from master to branch, git merge origin/master
3. fix any merge conflicts
4. run the test suite and any other needed tests
5. commit changes to the branch
6. submit a merge request on GitLab
7. accept merge after review. The person merging to master is recorded as the author.
8. delete the branch after merging