Add egg's picture
Merge branch 'master' of git.ines.nablaweb.org:ingesup/mfc
add egg's picture
Merge branch 'master' of git.ines.nablaweb.org:ingesup/mfc

Conflicts:
	public/game.js
	public/server.js
ajout images board
merge
restore