updated folder architecture
Merge branch 'master' of https://github.com/gglas/GA-Coding

Conflicts:

Week_06_Review_Refactor/11_lab/starter_code/matching/card_game_homework/
javascript/script.js
Merge branch 'master' of https://github.com/gglas/GA-Coding