Resolved
Merge branch 'master' of https://github.com/markwongsk/CAFamilyTree

Conflicts:
	FamilyTree.js