Merge branch 'master' of https://github.com/Deeg-Kim/Everything-Dojo

Conflicts:
	include/themedb.php
	include/themedb/view_body.php
gitignore
gitignore
Merge branch 'master' of https://github.com/Deeg-Kim/Everything-Dojo