Moving files, renaming package
Merge branch 'master' of github.com:tjuicy/Cardify

Conflicts:
	src/fr/eurecom/cardify/Lobby.java