Changes deck classes so that they are viewed correctly after being created.
Fix merge conflicts
Merge branch 'dev' of github.com:cs3733bdt/wpi-suite into dev