Merging conflicts.

diff --combined GlobalVariables/GlobalVariablesEachApp.groovy
index ae8b936042f5259750bbfa5c5f9791853bec2a30,ba78f9878f871119351c606ab7aa0d9d88446577..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/GlobalVariables/GlobalVariablesEachApp.groovy
--- 2/GlobalVariables/GlobalVariablesEachApp.groovy
+++ /dev/null
@@@ -1,16 -1,16 +1,0 @@@
--//Global variable for state[mode]
--def state = [home:[],away:[],night:[]]
--//Create a global logger object for methods
--def log = new Logger()
--//Create a global variable for Functions in Subscribe method
- def functionList = []
 -def functionList = new ArrayList(20)
--//Create a global variable for Objects in Subscribe method
- def objectList = []
 -def objectList = new ArrayList(20)
--//Create a global variable for Events in Subscribe method
- def eventList = []
 -def eventList = new ArrayList(20)
--//Create a global variable for settings
--def settings
--//Zip code
--def zipCode = 92617
--//atomicState variable
--def atomicState = [version: "1.01"]