added trendline
working on data points
Merge branch 'dev_josh'