Merging small changes.
[pingpong.git] / Code / Projects / SmartPlugDetector / src / main / java / edu / uci / iotproject / evaluation /
2018-11-28 rtrimanaClearing up conflicts.
2018-11-28 Janus Varmarkenadded a hacky solution for extracting a sanity-check...