zrrichards: Undo deck works properly
Merge branch 'Iteration-3-dev' of https://github.com/alexbragdon/wpi-suite into Iteration-3-dev