Adding chart.jsp to graph our data
fixed merge conflicts