Right comment
Merge branch 'master' of github.com:macecchi/Indicia-CS312

Conflicts:
	inc.journey.php
Merge branch 'master' of github.com:macecchi/Indicia-CS312
player fixed and got rid of loadContent, calling getData directly