Rough outline of DIYPS functions with refactored carb algorithms
add note on how we're modifying the AR algorithm in commit bb521d0
Merge branch 'release/0.5.0' into dev
Merge pull request #227 from scottleibrand/dev

add note on how we're modifying the AR algorithm in commit bb521d0
add option to host over ssl
make paths relative
Merge wip/add-ssl (and everything it inherited from dev) into wip/iob-cob
fix, only include ssl ca file if one is listed
Revert "make paths relative"

This reverts commit 7bd2247544be32b8a37dffea3bcd025f4095f492.
Merge branch 'wip/add-ssl' of https://github.com/nightscout/cgm-remote-monitor into nightscout-wip/add-ssl

Conflicts:
	env.js
	static/js/client.js
Merge branch 'nightscout-wip/add-ssl' into wip/iob-cob
disable websockets for now, causing more trouble then it's worth
Merge branch 'master' into wip/iob-cob
disable retroPredictions while brushing
Merge branch 'wip/iob-cob' into nightscout/wip/iob-cob

Conflicts:
	lib/websocket.js