Unknown changes, last person forgot commit
Merge branch 'master' of github.com:Dowers/tsea29
Fixed timing bug in RegulatoController