Committing exercise 4.
Merge origin/master