Merge pull request #37 from ahardy55/layout

Layout
set up heat map directory css/js file
fixed merge conflicts in default css and exercise_histories  still concerned about sprockets
Merge pull request #38 from aedwards12/heat_map

added heat_map directory css/js files on exercise_history index
fix merge conflict