fixed timing bug
Merge branch 'master' of github.com:xvedejas/whitehill

Conflicts:
	client/client.py