modified:   src/ctree/lgraph/LGraph.java
	modified:   src/ctree/tool/SimQuery.java
	modified:   src/ctree/tool/SimRanker.java
Merge branch 'master' of github.com:tknandu/UncertainGraphSimilarity

Conflicts:
	ClosureTree/src/ctree/tool/SimQuery.java
Merge branch 'master' of github.com:tknandu/UncertainGraphSimilarity
	modified:   answerSet.txt
	modified:   computePrecisionAndRecall.py
	modified:   databaseGeneration.py
	modified:   graphDatabase.txt
	modified:   graphIdToProbMapping.txt
	modified:   graphIdToSimMapping.txt
	modified:   src/ctree/lgraph/LGraph.java
	modified:   src/ctree/tool/SimQuery.java
	modified:   src/ctree/tool/SimRanker.java