Problems 21 & 22
Merge remote-tracking branch 'origin/master'