Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic

author rtrimana <rtrimana@uci.edu>

Tue, 15 Jan 2019 19:31:52 +0000 (11:31 -0800)

committer rtrimana <rtrimana@uci.edu>

Tue, 15 Jan 2019 19:31:52 +0000 (11:31 -0800)
author rtrimana <rtrimana@uci.edu>
Tue, 15 Jan 2019 19:31:52 +0000 (11:31 -0800)
committer rtrimana <rtrimana@uci.edu>
Tue, 15 Jan 2019 19:31:52 +0000 (11:31 -0800)
diff --cc Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/layer3/Layer3ClusterMatcher.java
Simple merge
diff --cc Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/layer3/SignatureDetector.java
Simple merge
author	rtrimana <rtrimana@uci.edu>
	Tue, 15 Jan 2019 19:31:52 +0000 (11:31 -0800)
committer	rtrimana <rtrimana@uci.edu>
	Tue, 15 Jan 2019 19:31:52 +0000 (11:31 -0800)
		1	2
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/layer3/Layer3ClusterMatcher.java	patch \|	diff1 \|	diff2 \|	blob \| history
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/detection/layer3/SignatureDetector.java	patch \|	diff1 \|	diff2 \|	blob \| history