gitignore
Merge branch 'master' of https://github.com/cocodelvaux/fabrizzio

Conflicts:
	.DS_Store
	accueil.html
	css/bootstrap.css
	img/.DS_Store