Merge branch 'master' of
https://github.com/Karsha-Project-LSF/visualizer.git

Conflicts:
	src/main/java/org/karsha/visualizer/DirectedGraphDemoServ.java
	src/main/webapp/view_graph.jsp
counting indegree and outdegree using jsp..
Merge pull request #2 from Karsha-Project-LSF/master

updating my fork
counting indegree and outdegree using jsp..
Merge branch 'master' of https://github.com/tharindu99/visualizer.git
Merge pull request #37 from gihantharanga/master

new app.js added conflicts resolved
year null problem solved work fine when loading time data and year
loaded
cc calculation under construction
Merge branch 'master' of
https://github.com/Karsha-Project-LSF/visualizer.git

Conflicts:
	src/main/webapp/js/function.js
	src/main/webapp/view_graph.jsp
clustering coefficient calculation and representation completed
remove unused libraries
clustering coefficent calculation completed, ignore the directions
New Quarter Data is added
servelet changed
3 buttons added in to the quartergraph tab
Merge pull request #38 from tharindu99/master

completed clustering coefficient function
Merge branch 'master' of
https://github.com/Karsha-Project-LSF/visualizer.git

Conflicts:
	src/main/java/org/karsha/visualizer/PostDataServ.java
	src/main/webapp/view_graph.jsp
Merge pull request #39 from gihantharanga/master

new data added
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/index.jsp
	src/main/webapp/view_graph.jsp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/index.jsp
	src/main/webapp/view_graph.jsp