try merge file
merged remote and local file
test
Merge branch 'master' of ssh://git@github.com/Djang0/lafay.git

Conflicts:
	lafay/src/be/lreenaers/lafay/web/control/UtilisateurCtrl.java