Second Increment

Max Ludeneitrequested to merge
dev into main

Added Userstories #32, #38, #30, #33

Merge request reports