Updating with part 2 of instructions
Merge remote-tracking branch 'origin/master'