Merge branch 'main' into watch-face-solstice

diff --cc movement/make/Makefile
index d020fc9ec7b519679997e64b37f683f00b4a1bd8,512f2ea803a68770bbaf4090a7c02c82b058de7a..df11a9ab0cf230ce7dd3d6ac5665e17ccce6704f
--- 1/movement/make/Makefile
--- 2/movement/make/Makefile
+++ b/movement/make/Makefile
@@@ -118,7 -118,10 +118,11 @@@ SRCS += 
    ../watch_faces/complication/flashlight_face.c \
    ../watch_faces/clock/decimal_time_face.c \
    ../watch_faces/clock/wyoscan_face.c \
 +  ../watch_faces/complication/solstice_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 \
+   ../watch_faces/complication/kitchen_conversions_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 2131e589a363036164337ca82f1f5300d4213c5b,be3a015c16c8384bb301576d0d05217b141f9de9..a3ccc130ec5e5ebb2fdf8544b8c379280410326b
--- 1/movement/movement_faces.h
--- 2/movement/movement_faces.h
+++ b/movement/movement_faces.h
@@@ -95,7 -95,10 +95,11 @@@
  #include "flashlight_face.h"
  #include "decimal_time_face.h"
  #include "wyoscan_face.h"
 +#include "solstice_face.h"
+ #include "couch_to_5k_face.h"
+ #include "minute_repeater_decimal_face.h"
+ #include "tuning_tones_face.h"
+ #include "kitchen_conversions_face.h"
  // New includes go above this line.
  
  #endif // MOVEMENT_FACES_H_