Reporting and such
Merge remote-tracking branch 'origin/master'

Conflicts:
	graph.html