made minor changes spacing etc , added default construtor to cardDeck, combined contents of both main files
Fixed conflict in cardDeck files
Merge branch 'master' of github.com:cathaldcronin1/EE6411