select_coffee_maker updated
video page updated.
primary view controller 90% updated.  Storyboard also.  We’re now_basically_ up to date.
Merge remote-tracking branch 'origin/master' into alarmcode
initial code for new alarm view controller