Cleaned up
Merge branch 'plot'

Conflicts:
	plot.html