Merge branch '34-rematch-function-and-endpoint' of...

Merge branch '34-rematch-function-and-endpoint' of https://git.gvk.idi.ntnu.no/HermanDyrkorn/salamander-api into 34-rematch-function-and-endpoint

merging

.gitignore

@@ -4,7 +4,6 @@ images
 __pycache__
 algorithm/train_src/dlc_model
 algorithm/train_src/imageai_model
-img_analyze/*.png
 env
 temp_images
 api/database/database.db