working on the guided tutorial
about to merge in master
finished guide
Merge remote-tracking branch 'origin/master' into Carrie-3.24