Add calvin merged face
Make calvin's SVG tree flatter for easier animation
Add mashi face view with JS to switch between animations