oh god
Merge branch 'master' of https://github.com/bchalifo/Clue_ours
Merge branch 'master' of https://github.com/bchalifo/Clue_ours
Got our tests working