Squash Merge

Figure 38: Squashing Commits from Branch to Master