More minor things

git won't sync unless I commit.
Merge branch 'master' of https://github.com/mpickering/group-4-practical

Conflicts:
	static/plotter.js
Merge branch 'master' of https://github.com/mpickering/group-4-practical