stuff
Merge branch 'master' of https://github.com/lazyfiction/telegraphOperator

Conflicts:
	js/morseGen/test.html