akram commence
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/bin/MenuPrincipal/MenuPrincipalRev1.class
je suis perdu :(
Merge branch 'master' of https://github.com/proto3/Manhattan.git
menu principal en cour de developpement
Merge branch 'master' of https://github.com/proto3/Manhattan.git