Merge branch 'tharindu99-master'
Merge branch 'master' of https://github.com/gihantharanga/visualizer into gihantharanga-master
removing template file
Merge branch 'gihantharanga-master'
Merge remote-tracking branch 'upstream/master'
removing template file
Merge branch 'master' of https://github.com/tharindu99/visualizer into tharindu99-master
removing template file
Merge remote-tracking branch 'upstream/master'
removing template file
removing template file
Merge branch 'gihantharanga-master'
resolving conflitcs
Merge branch 'gihantharanga-master'
Merge branch 'master' of https://github.com/gihantharanga/visualizer.git

Conflicts:
	src/main/webapp/view_graph.jsp
resolving conflitcs
resolving conflitcs
Merge branch 'kkasunperera-master'
ss
conflicts resolved

Conflicts:
	src/main/webapp/view_graph.jsp