Graph v0.15
Merge branch 'master' of https://github.com/timvdalen/2II25-project

Conflicts:
	public_html/assets/js/canvas.js