merge master

This commit is contained in:
Jon Maddox
2015-10-24 11:14:36 -04:00
51 changed files with 6470 additions and 1316 deletions

7
.gitignore vendored
View File

@@ -13,5 +13,12 @@ npm-debug.log
# HomeBridge
config.json
config.test.json
persist/
<<<<<<< HEAD
log/
=======
.AppleDouble
>>>>>>> master