Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/energy_data_project/T08_WorldCities.py

src/energy_data_project/T08_WorldCities.py

@@ -3,6 +3,9 @@ from typing import Optional
 import pandas as pd
 from numpy.f2py.crackfortran import true_intent_list
 
+def foo():
+    print(42)
+    return 42
 
 def get_population_of_country(df, country):
     """