Rewrote DeckFactory as singleton static factory

Code formatting. Also added another game with different pips.