Modified transitions
Merge branch 'master' of https://www.github.com/pranavashok/magar
Merging from sachin