made clear actually clear
Merge branch 'master' of https://github.com/aterwl/cluedo.git
Merge branch 'master' of https://github.com/aterwl/cluedo.git
we're just hanging out for a conflict.