Map art
Merge branch 'master' of github.com:haMor/Project-Doggie
Refactored plaza and grandma file
refactored plaza
fixed merge conflict