Merge branch 'master' of https://github.com/Janek2004/Academy-Child-Theme-for-BCBA

Conflicts:
	academy-child/template-certificate.php