.
Merge branch 'master' of ssh://vmig2k01.univ-mlv.fr:2222/opt/git/lips-compil
remove hard url
Merge branch 'master' of ssh://vmig2k01.univ-mlv.fr:2222/opt/git/lips-compil

Conflicts:
	app.rb