was drawing more than necessary.
Merge branch 'master' of https://github.com/cwilso/oscilloscope

Conflicts:
	js/oscilloscope.js