main game logic complete, 1 bug in it. added functions to cardDeck, small bits tidied up

* Main Game Logic Complete
* There's a bug in there, something to do with the cards being removed from the main deck and being added to players hand.
* Small tidy up changes
* Added up functions to cardDeck, These can probably be removed if necessary. I just added what I needed! :)

@dreadeye 
@bagofnarcissism