fixed a bug
Merge branch 'vitals_test' into updated_touch_screen