controller
Merge branch 'master' of https://github.com/PatrykGala/Modbus.git
Merge branch 'master' of https://github.com/PatrykGala/Modbus.git
dzialanie ramek
Merge branch 'master' of https://github.com/PatrykGala/Modbus.git

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