bunch of changes to cluedo yo
fixed merge clonflicts