misc changes
misc changes
Merge branch 'master' of https://github.com/ericpgreen/babymonitor

Conflicts:
	README.md