refacted cancel order logic to within orders
Merge branch 'master' of https://github.com/kjian279/RISC
attack collisions are now resolved before being executed