Transition touch ups
Merge branch 'master' of https://github.com/rezakhadjavi/RoshTimer into rezakhadjavi-master