Edit Your Quotebook

Objective:
This assignment is designed to solidify the following skills that you
have learned in the previous videos:
1. Merging branches

To Do:
1. Merge the branch you made in the previous assignment (for
motivational quotes) into your master branch
2. Solve any merge conflicts that arise
3. Check your git history

Optional:
4. Delete the motivational quotes branch (hint: you will add a
modifier to the git branch command and then specify the
branch to delete)