Fixed merge conflicts
deleted unnessecary files
Merge branch 'kevin'
Merging changes
Merge branch 'sophie'
Merging new changes for sophie