Semi-fixed trees
Merge branch 'master' of github.com:timvdalen/2II25-project

Conflicts:
	public_html/assets/js/Graph.class.js
	public_html/assets/js/canvas.js