wrote abstract regulator, re-added waiting room
Merge branch 'master' of https://github.com/Dowers/tsea29