minor tree update
Merge branch 'master' of https://github.com/m4tx/linux-distro-timeline
tree update; json loading
Merge branch 'master' of https://github.com/m4tx/linux-distro-timeline

Conflicts:
	dist/tree.js