Works
minor fix
Fix conflict
Remove global vars
Merge pull request #6 from jvanbrug/tla_StopAndWait

Tla stop and wait
Routers have not changed the function name yet, so runtest.py will have some errors.