rm empty file in lib/api/entries/
Merge pull request #296 from dduugg/feature/rm-middleware

rm empty file in lib/api/entries/
Merge pull request #300 from jasoncalabrese/wip/fix-fading

Fix the annoying fading line bug
combine pre-bolus carbs with pre-bolus time for the pushover message
Merge branch 'dev' into prod
Merge branch 'wip/time-adjust' into prod