merge problems
Merge errors fixed
Merge branch 'master' of https://github.com/mtzimour/Clue
Control panel kind of works
Merge branch 'master' of https://github.com/mtzimour/Clue