redid transitions, finished ricardio
Merge branch 'master' of https://github.com/harrisse/AdventureTime