test
Merge branch 'master' of
https://github.com/pouzzler/IED-Logic-Simulator.git

Conflicts:
	src/gui/mainwindow.py