Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/prettier…

…-2.8.4' into dependabot/npm_and_yarn/prettier-2.8.4

# Conflicts:
#	gitartwork.svg
#	package-lock.json
#	package.json