Resolving merge conflict
Merge branch 'Development' of https://github.com/MSU-CS-Software-Engineering/habitgame into Development