Merge branch 'encadyma's-Sandbox' of https://github.com/Deeg-Kim/Everything-Dojo into encadyma's-Sandbox

Conflicts:
themizerindex.php