updates
Merge branch 'master' of https://github.com/securingsincity/node-rpi-home-tracker

Conflicts:
	index.js