Merge branch 'main' into repetition_minute

diff --cc movement/make/Makefile
index a9530dd3c12fc5ff3c7e4db29a78c123609a01b3,6865960ce5c325affdec3eba8cde8a9aad4d31e7..aa22262718148443fcd114aab7d0caa717f68d35
--- 1/movement/make/Makefile
--- 2/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -96,7 -96,7 +96,8 @@@ SRCS += 
    ../watch_faces/complication/morsecalc_face.c \
    ../watch_faces/complication/rpn_calculator_face.c \
    ../watch_faces/complication/ships_bell_face.c \
+   ../watch_faces/complication/habit_face.c \
 +  ../watch_faces/clock/repetition_minute_face.c \
  # New watch faces go above this line.
  
  # Leave this line at the bottom of the file; it has all the targets for making your project.

diff --cc movement/movement_faces.h
index 22eff425c3c5c566c60a337620c176c3294d6518,901260eb0e408fbcf4a2be46a5d820d447c551a1..cd58ceee318a14691b5fb3d14e00996f9b02aeab
--- 1/movement/movement_faces.h
--- 2/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -74,7 -74,7 +74,8 @@@
  #include "morsecalc_face.h"
  #include "rpn_calculator_face.h"
  #include "ships_bell_face.h"
+ #include "habit_face.h"
 +#include "repetition_minute_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_