New weighted clustering algorithm in C
Resolved merge conflict?
Resolved merge conflict?