Adding Exercise graph, improving template for Water and Exercise, styling for both
removing committed dist/main.css
fixing conflicts