version 24.06.13
Merge branch 'master' of https://github.com/PattyGeorgi/Torti

Conflicts:
	app/controllers/statistics_controller.rb