fonds
polices
indentation, bug fixed
ajout
parties
Merge branch 'master' of https://github.com/emmagrisot/preview

Conflicts:
	css/style.less
	index.html
3
Creation dossiers, debut travail
nouveau
new
ancres
Hexagone +texte
change
Merge remote-tracking branch 'origin/concept'

Conflicts:
	css/style.less
	index.html
Fixed conflict w/ concept
Merge branch 'Home'

Conflicts:
	css/style.less
	index.html
Merge branch 'master' of https://github.com/emmagrisot/preview

Conflicts:
	css/style.less
	index.html
Fix conflict w/ home
Fixed conflict w/ home
logo