moved scripts init to child theme
Merge branch 'master' of https://github.com/studio-cartogram/truefriend

Conflicts:
	functions.php