Resolved merge conflicts (?)
Resolved merge conflicts (?)

lspector/Clojush,saulshanabrook/Clojush,NicMcPhee/Clojush,saulshanabrook/Clojush,NicMcPhee/Clojush,thelmuth/Clojush,thelmuth/Clojush,lspector/Clojush,Vaguery/Clojush,Vaguery/Clojush