suppression main
add main
Merge branch 'master' of github.com:TIPS-GL/VeloLiberteSante

Conflicts:
	projet2/main.cpp
main
Merge branch 'master' of github.com:TIPS-GL/VeloLiberteSante