Added --ff-only to 'git pull upstream master'.

Ensures that no commits have been made directly to master.
Added Advanced Techniques section