Modified .jsp files/fixed link titles
Adding chart.jsp to graph our data
fixed merge conflicts
Fixed some merge problems