Chap. 5, ex. 3 - 5.
Merge remote-tracking branch 'origin/master'