initial test set-up
import reorder
ensure all bytes are received
Merge branch 'master' into s7comm_tests

Conflicts:
	conpot/protocols/s7comm/s7_server.py
Basic s7 test
Using the default template
this basically works to some extent..