Project for Software Design (XB_40007), Computer Science @ VU Amsterdam, 2019/2020. TextAdventureGame Group 7: Koen van den Burg, Bogdan Cercel, Claudia Grigoras, Sofia Konovalova, Wilkin van Roosmalen.
We need to fix the conflicts before merging. Currently having issues figuring out what to do. Can't find these files on my local git on both branches...
This pull request contains the changes for Assignment 2