Removed conflicts
Merge branch 'master' of https://github.com/jonathanmcelroy/EnigmaDevice

Conflicts:
	source/plotter.h