images animating, no colored bar graph
fix merge conflict in app.css