adds chart.js gem
adds charts to show page
adds Css and matches colors for chart
uncommenting javascript
resolved merge conflict