Adds voting cards and fixed conflicts

Authors: dbeckwith, quan1992