#26 TU ControllerSpec
Merge branch 'dev' of https://github.com/Ornro/ThatNight into dev