added new scripts to start client and localserver, updated shot.py to accept third parameter
merged conflicts