Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Game.java

Having trouble using the "deck" object to be transferred to
main (as opposed to how I had it before, which only
 transfers the unshuffled deck.

At this point, we are totallly ready to build the Player class.
I need to port the Player class to a new file and clean
up the code a bit, but... other than that, we're ready to go.