Ok.
Merge branch 'master' of github.com:marcantoinefortier/TP4-AppleEater-Client

Conflicts:
	TP4-AppleEater-Client/src/client/UserInterface.java