Stuff
Timing bug fix
hmmm
Fixes
Bug fixes
Merge branch 'master' into flowControl

Conflicts:
	controller.py
	h100Controller.py
	switch/switch.py