changes local url
Merge branch 'master' of github.com:swayam18/evobot
robustification
Merge branch 'master' of github.com:swayam18/evobot

Conflicts:
	code/trawler/camera.py
	code/trawler/video.py
incearses socket timeout