Merge branch 'feature/nico' into develop
Merge branch 'develop' of https://github.com/BowlingGroup/Bowling_Project into develop