Revert "Conflicts"

This reverts commit b5407b680a260357643f6dc931fd66fb165b0377, reversing
changes made to 87a34ad7044c1ff5022a9909bfc9a035d774a1ac.
Revert "Conflicts"

This reverts commit b5407b680a260357643f6dc931fd66fb165b0377, reversing
changes made to 30069abbc0d9e39fde4e47ffdb01c13bee38a668.

fixed the conflicts

Conflicts:
	SpanningTree.java
fixed a minor typo