Résolutions soucis home
Merge github.com:Cliko/projet-AngularJS
Update
Merge github.com:Cliko/projet-AngularJS

Conflicts:
	app/index.html