Tulleting
Merge branch 'master' of https://github.com/tjuicy/Cardify.git

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