kkuhn dmmurray fixed 4 red flags, 180 yellow flags, and a couple of test cases that were using improper constructors
kkuhn dmmurray fixed merge errot in Deck.java, used dev code made a varible final.