Added scp
Merge branch 'master' of github.com:blanu/blocking-test
Fixed IP of server

Conflicts:
	capture/src/tasks/testing.py