SettingsWindow
Merge branch 'master' of git://github.com/Mrmaxmeier/LogicCircuitSim

Conflicts:
	sim.py