working spoof script before timing addition
Merge branch 'master' of github.com:dcashman/thesis

Conflicts:
	misc/network/src/spoof_handshake.py
Merge branch 'master' of github.com:dcashman/thesis
working spoof script not yet tested with time