transitions fixed
Merge branch 'master' of https://github.com/Malharhak/telepathy-training
dodo