Final commit before mergin blood sugar app into master