Merging the work

Today we merged all the work to the main project. We also presented some work to the tutor like first version of the feedback system and some fixes to UI. We also had created a testing environment for the dialogs so we could test them without playing the entire game. When we merged the work we had some problems so we had to revert some changes and merge them later once they are fixed.