new file:   README.md
	new file:   build.sbt
	new file:   local-submit.sh
	new file:   src/main/scala/operators.scala
	new file:   src/main/scala/toughness.scala
Merge branch 'master' of https://github.com/renqHIT/K-Tough

Conflicts:
	README.md

	deleted:    README.md
	new file:   py/bfs.py
	new file:   py/brute-force.py
	new file:   py/data/SNAP/ca_road.xml.gz
	new file:   py/data/SNAP/com-dblp.txt
	new file:   py/data/SNAP/com_dblp.xml.gz
	new file:   py/data/SNAP/roadNet-CA.txt
	new file:   py/data/filtered-bt.pdf
	new file:   py/data/graph-1.png
	new file:   py/data/graph-1.xml.gz
	new file:   py/data/graph-2.png
	new file:   py/data/graph-2.xml.gz
	new file:   py/data/graph-3.png
	new file:   py/data/graph-3.xml.gz
	new file:   py/data/poisson.pdf
	new file:   py/data/r.pdf
	new file:   py/data/r.xml.gz
	new file:   py/data/residual.pdf
	new file:   py/data/running-examples/circle.pdf
	new file:   py/data/running-examples/circle.xml.gz
	new file:   py/data/running-examples/delaunay.xml.gz
	new file:   py/data/running-examples/path.pdf
	new file:   py/data/running-examples/path.xml.gz
	new file:   py/data/running-examples/running-example-1.png
	new file:   py/data/running-examples/running-example-1.xml.gz
	new file:   py/data/running-examples/running-example-2.png
	new file:   py/data/running-examples/running-example-2.xml.gz
	new file:   py/data/search_example.pdf
	new file:   py/data/small-cases/graph-4.png
	new file:   py/data/small-cases/graph-4.xml.gz
	new file:   py/debug.log
	new file:   py/delta-approx.py
	new file:   py/example-1.png
	new file:   py/example-2.png
	new file:   py/filter.py
	new file:   py/generate_graph.py
	new file:   py/hueristic.py
	new file:   py/hw1_with_networkx.py
	new file:   py/naive-k-tough.py
	new file:   py/poisson.pdf
	new file:   py/random-network.py
	new file:   py/runnung-example.py
	new file:   py/tougher-graph.py
	new file:   py/toughness.py
	new file:   py/txt2xml.py
	RUN.md