new file:   FeatureGeneration.py
	new file:   evaluation.txt
	new file:   evaluationQueryGraph.txt
	modified:   output.txt
	modified:   src/ctree/tool/SimQuery.java
	new file:   toyEvaluationGraph.txt
	modified:   ../FeatureGeneration.py
	new file:   ../evaluation.txt
	new file:   ../toyEvaluationGraph.txt
	modified:   ClosureTree/FeatureGeneration.py
	modified:   ClosureTree/evaluation.txt
	modified:   ClosureTree/evaluationQueryGraph.txt
	modified:   ClosureTree/output.txt
	modified:   ClosureTree/src/ctree/tool/SimQuery.java
	modified:   ClosureTree/toyEvaluationGraph.txt
Merge branch 'master' of github.com:tknandu/UncertainGraphSimilarity

Conflicts:
	ClosureTree/output.txt
	new file:   computePrecisionAndRecall.py
Merge branch 'master' of github.com:tknandu/UncertainGraphSimilarity