change to koalas
rename variable
Merge branch 'master' of https://github.com/schakif/Set

Conflicts:
	bin/game/Deck.class
	src/game/Deck.java
position changed
Merge branch 'master' of https://github.com/schakif/Set

Conflicts:
	bin/.gitignore
	src/game/Deck.java
branchTesting
Merge branch 'empty-package-test' of https://github.com/schakif/Set
Trying something
Trying something