Merge branch 'pr/22' into develop
Merge branch 'develop' of https://github.com/algonquinDevelopers/SoftwareProject into develop