s
a
a
Merge branch 'master' of https://github.com/PatrykGala/Modbus.git

Conflicts:
	Modbus/src/Swing/ConnectionSetup.java
	Modbus/src/Swing/ReadWriteDefinition.java