Added a mushroom.
Added Yoshi.
We did a bunch of stuff.
Merge remote-tracking branch 'origin/master'
"Attempting to fix Leap errors."


Change-Id: Id54dfe509085430025eb5a95626535566738da93