maj
Merge branch 'master' of https://github.com/LV-TO/Annual-Project

Conflicts:
	Projet annuel - CruiseControl/How to use/cruisecontrol-use.xml