Update GettingStartedWithScratch.md
fix conflict
Merge branch 'Archrath-patch-2'
Merge branch 'master' of github.com:SAHSComputerScience/Scratch