Resolve merge conflict in film model.
"pull"
Merge branch 'master' of github.com:callen6/lady_parts
Add working canvas to cast view.
Attempt to add color to bars.
Found a fucking missing parentheses after .linear that cost me hours of my life. fuck you parentheses.