position changed
Merge branch 'master' of https://github.com/schakif/Set

Conflicts:
	bin/.gitignore
	src/game/Deck.java