untracked
Merge branch 'alexei' of github.com:Gluckens/Casinotopia into danny
Merge branch 'alexei' of github.com:Gluckens/Casinotopia into olivier
Merge branch 'danny' of github.com:Gluckens/Casinotopia into olivier
Avant restructuration GIT
Restructuration git effectue
merge
restructure
Merge branch 'danny' of github.com:Gluckens/Casinotopia into olivier

Conflicts:
	src/ca/uqam/casinotopia/Administrateur.java
	src/ca/uqam/casinotopia/Avatar.java
	src/ca/uqam/casinotopia/Carte.java
	src/ca/uqam/casinotopia/Case.java
	src/ca/uqam/casinotopia/Clavardage.java
	src/ca/uqam/casinotopia/Client.java
	src/ca/uqam/casinotopia/CompteCasino.java
	src/ca/uqam/casinotopia/CouleurCarte.java
	src/ca/uqam/casinotopia/Croupier.java
	src/ca/uqam/casinotopia/DonUniqueCasino.java
	src/ca/uqam/casinotopia/DonUniqueClient.java
	src/ca/uqam/casinotopia/FigureCarte.java
	src/ca/uqam/casinotopia/Fondation.java
	src/ca/uqam/casinotopia/Jeu.java
	src/ca/uqam/casinotopia/JeuCartes.java
	src/ca/uqam/casinotopia/Joueur.java
	src/ca/uqam/casinotopia/JoueurBlackJack.java
	src/ca/uqam/casinotopia/JoueurRoulette.java
	src/ca/uqam/casinotopia/ListeAmis.java
	src/ca/uqam/casinotopia/Main.java
	src/ca/uqam/casinotopia/PartageGainsCasino.java
	src/ca/uqam/casinotopia/PartageGainsClient.java
	src/ca/uqam/casinotopia/Partie.java
	src/ca/uqam/casinotopia/Salle.java
	src/ca/uqam/casinotopia/SoutienTechnique.java
	src/ca/uqam/casinotopia/TableJeuTableModel.java
	src/ca/uqam/casinotopia/TypeCase.java
	src/ca/uqam/casinotopia/TypeCouleurCase.java
	src/ca/uqam/casinotopia/TypeEtatPartie.java
	src/ca/uqam/casinotopia/TypeJeu.java
	src/ca/uqam/casinotopia/TypeMise.java
	src/ca/uqam/casinotopia/TypePariteCase.java
	src/ca/uqam/casinotopia/Utilisateur.java
	src/ca/uqam/casinotopia/bd/ControleurBD.java
	src/ca/uqam/casinotopia/client/MainClient.java
	src/ca/uqam/casinotopia/commande/Commande.java
	src/ca/uqam/casinotopia/commande/CommandeClient.java
	src/ca/uqam/casinotopia/commande/CommandeClientControleurChat.java
	src/ca/uqam/casinotopia/commande/CommandeClientControleurClient.java
	src/ca/uqam/casinotopia/commande/CommandeClientControleurPrincipal.java
	src/ca/uqam/casinotopia/commande/CommandeClientControleurRoulette.java
	src/ca/uqam/casinotopia/commande/CommandeServeur.java
	src/ca/uqam/casinotopia/commande/CommandeServeurControleurChat.java
	src/ca/uqam/casinotopia/commande/CommandeServeurControleurClient.java
	src/ca/uqam/casinotopia/commande/CommandeServeurControleurPrincipal.java
	src/ca/uqam/casinotopia/commande/CommandeServeurControleurRoulette.java
	src/ca/uqam/casinotopia/commande/CommandeServeurControleurThread.java
	src/ca/uqam/casinotopia/commande/client/CmdAfficherJeuRoulette.java
	src/ca/uqam/casinotopia/commande/client/CmdAfficherMenuPrincipal.java
	src/ca/uqam/casinotopia/commande/client/CmdAfficherPagePrincipal.java
	src/ca/uqam/casinotopia/commande/client/CmdAjouterMessageChat.java
	src/ca/uqam/casinotopia/commande/client/CmdEnvoyerInformationChat.java
	src/ca/uqam/casinotopia/commande/client/CmdInformationInvalide.java
	src/ca/uqam/casinotopia/commande/client/CmdMettreAJourUtilisateurChat.java
	src/ca/uqam/casinotopia/commande/client/CmdUpdateCasesRoulette.java
	src/ca/uqam/casinotopia/commande/serveur/CmdAuthentifierClient.java
	src/ca/uqam/casinotopia/commande/serveur/CmdCalculerGainRoulette.java
	src/ca/uqam/casinotopia/commande/serveur/CmdEnvoyerMessageChat.java
	src/ca/uqam/casinotopia/commande/serveur/CmdJouerRoulette.java
	src/ca/uqam/casinotopia/commande/serveur/CmdMiserRoulette.java
	src/ca/uqam/casinotopia/commande/serveur/CmdSeConnecterAuChat.java
	src/ca/uqam/casinotopia/commande/serveur/CmdTournerRoulette.java
	src/ca/uqam/casinotopia/connexion/Connectable.java
	src/ca/uqam/casinotopia/connexion/Connexion.java
	src/ca/uqam/casinotopia/console/CInput.java
	src/ca/uqam/casinotopia/controleur/Controleur.java
	src/ca/uqam/casinotopia/controleur/ControleurClient.java
	src/ca/uqam/casinotopia/controleur/ControleurServeur.java
	src/ca/uqam/casinotopia/controleur/client/ClientThread.java
	src/ca/uqam/casinotopia/controleur/client/ControleurBarreMenuBas.java
	src/ca/uqam/casinotopia/controleur/client/ControleurChatClient.java
	src/ca/uqam/casinotopia/controleur/client/ControleurClientClient.java
	src/ca/uqam/casinotopia/controleur/client/ControleurMenuPrincipal.java
	src/ca/uqam/casinotopia/controleur/client/ControleurPrincipalClient.java
	src/ca/uqam/casinotopia/controleur/client/ControleurRouletteClient.java
	src/ca/uqam/casinotopia/controleur/serveur/ControleurChatServeur.java
	src/ca/uqam/casinotopia/controleur/serveur/ControleurClientServeur.java
	src/ca/uqam/casinotopia/controleur/serveur/ControleurPrincipalServeur.java
	src/ca/uqam/casinotopia/controleur/serveur/ControleurRouletteServeur.java
	src/ca/uqam/casinotopia/controleur/serveur/ControleurServeurThread.java
	src/ca/uqam/casinotopia/drag_n_drop/AbstractDropManager.java
	src/ca/uqam/casinotopia/drag_n_drop/AbstractGhostDropManager.java
	src/ca/uqam/casinotopia/drag_n_drop/DropEvent.java
	src/ca/uqam/casinotopia/drag_n_drop/DroppableReceiver.java
	src/ca/uqam/casinotopia/drag_n_drop/DroppableTarget.java
	src/ca/uqam/casinotopia/drag_n_drop/GhostComponentAdapter.java
	src/ca/uqam/casinotopia/drag_n_drop/GhostDropAdapter.java
	src/ca/uqam/casinotopia/drag_n_drop/GhostDropEvent.java
	src/ca/uqam/casinotopia/drag_n_drop/GhostDropListener.java
	src/ca/uqam/casinotopia/drag_n_drop/GhostGlassPane.java
	src/ca/uqam/casinotopia/drag_n_drop/GhostMotionAdapter.java
	src/ca/uqam/casinotopia/drag_n_drop/GhostPictureAdapter.java
	src/ca/uqam/casinotopia/drag_n_drop/MisesGhostComponentAdapter.java
	src/ca/uqam/casinotopia/drag_n_drop/MisesGhostDropEvent.java
	src/ca/uqam/casinotopia/drag_n_drop/MisesGhostPictureAdapter.java
	src/ca/uqam/casinotopia/modele/Modele.java
	src/ca/uqam/casinotopia/modele/client/ModeleChatClient.java
	src/ca/uqam/casinotopia/modele/client/ModeleClientClient.java
	src/ca/uqam/casinotopia/modele/client/ModelePartieRouletteClient.java
	src/ca/uqam/casinotopia/modele/client/ModelePrincipalClient.java
	src/ca/uqam/casinotopia/modele/client/ModeleRoueRouletteClient.java
	src/ca/uqam/casinotopia/modele/client/ModeleTableJeuClient.java
	src/ca/uqam/casinotopia/modele/serveur/ModelePartieBlackJackServeur.java
	src/ca/uqam/casinotopia/modele/serveur/ModelePartieRouletteServeur.java
	src/ca/uqam/casinotopia/modele/serveur/ModeleRoueRouletteServeur.java
	src/ca/uqam/casinotopia/modele/serveur/ModeleServeurPrincipal.java
	src/ca/uqam/casinotopia/modele/serveur/ModeleTableJeuServeur.java
	src/ca/uqam/casinotopia/modele/serveur/ModeleUtilisateurServeur.java
	src/ca/uqam/casinotopia/observateur/BaseObservable.java
	src/ca/uqam/casinotopia/observateur/Observable.java
	src/ca/uqam/casinotopia/observateur/Observateur.java
	src/ca/uqam/casinotopia/serveur/ServeurMain.java
	src/ca/uqam/casinotopia/vue/FrameApplication.java
	src/ca/uqam/casinotopia/vue/FrameConnexion.java
	src/ca/uqam/casinotopia/vue/GridBagHelper.java
	src/ca/uqam/casinotopia/vue/Vue.java
	src/ca/uqam/casinotopia/vue/VueBarreMenuBas.java
	src/ca/uqam/casinotopia/vue/VueChat.java
	src/ca/uqam/casinotopia/vue/VueMenuPrincipal.java
	src/ca/uqam/casinotopia/vue/VueRouletteRoue.java
	src/ca/uqam/casinotopia/vue/roulette/MisesGhostDropManager.java
	src/ca/uqam/casinotopia/vue/roulette/VueRoulette.java
	src/ca/uqam/casinotopia/vue/roulette/VueRouletteActions.java
	src/ca/uqam/casinotopia/vue/roulette/VueRouletteTableau.java
	src/ca/uqam/casinotopia/vue/roulette/VueRouletteTapis.java
	src/ca/uqam/casinotopia/vue/roulette/VueRouletteTapis_bad.java
	src/fichiers pour BD/01_sript_BD_creerShema.sql
	src/fichiers pour BD/02_sript_BD_creerTriggers.sql
	src/fichiers pour BD/03_sript_BD_creerdonnesTest.sql
	src/fichiers pour BD/04_sript_BD_desinstaller.sql
	src/fichiers pour BD/ojdbc14.jar
	src/img/chip_10.png
	src/img/chip_25.png
	src/img/chip_5.png
	src/img/chip_50.png
	src/img/roulette-table-grand.jpg
	src/img/roulette-table-petit.jpg
	src/img/roulette-table.gif
	src/img/roulette-table.jpg
	src/img/roulette-table2.jpg
	src/img/rouletteRoue.gif
	src/img/splash.jpg