ккк
Merge branch 'master' of https://github.com/TeamYosemite/Team-Yosemite-Project

Conflicts:
	source/functions.php