Finished Assignment #2, added all 30 cards and fixed a few bugs