Merge branch 'main' into couch-2-5k

diff --cc movement/make/Makefile
index d27b796a1222d470aaad7e5c9c23bde50a7bec61,376ee74412a5a08e50764325479def52f7edeca8..c294b06892392124960e8f8cb4b0428083803e08
--- 1/movement/make/Makefile
--- 2/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -118,7 -118,8 +118,9 @@@ SRCS += 
    ../watch_faces/complication/flashlight_face.c \
    ../watch_faces/clock/decimal_time_face.c \
    ../watch_faces/clock/wyoscan_face.c \
 +  ../watch_faces/complication/couch_to_5k_face.c \
+   ../watch_faces/clock/minute_repeater_decimal_face.c \
+   ../watch_faces/complication/tuning_tones_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 a88b322236be6ef3f5ccdc8627e612c9299ec02f,96fc60ace737f1b8fc102352e5aa6dc255e30b25..cb58612fa00f520cd99af5af0e026de8d1b2fb25
--- 1/movement/movement_faces.h
--- 2/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -95,7 -95,8 +95,9 @@@
  #include "flashlight_face.h"
  #include "decimal_time_face.h"
  #include "wyoscan_face.h"
 +#include "couch_to_5k_face.h"
+ #include "minute_repeater_decimal_face.h"
+ #include "tuning_tones_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_