changement ok
Merge branch 'master' of ssh://git@github.com/DaRkD0G/ProjetAifcc.git

Conflicts:
	AppAIFCC/assets/css/style.css
Merge branch 'master' of ssh://git@github.com/DaRkD0G/ProjetAifcc.git
Template formation + scripts