Merging changes.
authorrtrimana <rtrimana@uci.edu>
Wed, 5 Sep 2018 21:28:03 +0000 (14:28 -0700)
committerrtrimana <rtrimana@uci.edu>
Wed, 5 Sep 2018 21:28:03 +0000 (14:28 -0700)
commit1fb088ef51ce9121ab70e242681e4e4c523b47dc
treed765c0391fc482f7468fb2b62dc2fc8276da7610
parent61e78809d5d17320891f12baa1f8e36ad2474da8
parentd6b17b053971ea9cd2a8c6987d03d6ca0dad91b3
Merging changes.
Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Main.java