Mostly sorting
Merge branch 'master' of https://github.com/tjuicy/Cardify

Conflicts:
	src/fr/eurecom/cardify/Game.java
hore