js chart styling
more chart js styling
fixed index merge conflict
fixed a catastrophic merge conflict error from before in movies.js