konflikt
Merge branch 'master' of https://github.com/PatrykGala/Modbus

Conflicts:
	Modbus/src/atrem/modbus/Controller.java