Committing exercise 3.4 part 1.
Merge origin/master