test
Merge branch 'master' of
https://github.com/secu2/miage_projet_framework.git

Conflicts:
	src/application/chat/Vue.java
Merge branch 'master' of https://github.com/secu2/miage_projet_framework.git
Chat encours
Merge branch 'master' of https://github.com/secu2/miage_projet_framework.git