Merge branch 'patch-1' of https://github.com/diokatsu/ArtCodeInteractivity into diokatsu-patch-1

Conflicts:
GettingSetup_01/links.md
Merge branch 'master' of https://github.com/shawnlawson/ArtCodeInteractivity