initialisation de compass
initialisation de suzy
init de compass sans pluggins comme suzy
Merge branch 'dev'
Mise en place du menu principale
Petite MaJ
Correction Header
Fin du header
mise en place module de présentation
module projet, module documentation, début footer
fin intégration page acceuil + html page projets
création des pages html et images dans les dossier + correction animation header
Merge branch 'dev'

Conflicts:
	index.html

	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_basic.scssc
	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_footer.scssc
	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_header.scssc
	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_lastSearch.scssc
	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_mixin.scssc
	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_normalize.scssc
	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_presentation.scssc
	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_projetSection.scssc
	new file:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/_variable.scssc
	modified:   .sass-cache/dc4b51c6a53b2dc39924e6a917d36b72fd4424e0/main.scssc
	modified:   css/main.css
	new file:   html/about.html
	new file:   html/contact.html
	new file:   html/projets.html
	new file:   images/LinkedinIcon.png
	new file:   images/bibliosquare.jpg
	new file:   images/casseBrique.png
	new file:   images/dietezia.png
	new file:   images/jocelyneScharres.png
	new file:   images/lePendu.png
	new file:   images/logoFacebook.png
	new file:   images/logoRss.png
	new file:   images/logoTwitter.png
	new file:   images/refonteImangi.png
	modified:   index.html
	new file:   scss/_basic.scss
	new file:   scss/_footer.scss
	new file:   scss/_header.scss
	new file:   scss/_lastSearch.scss
	new file:   scss/_mixin.scss
	new file:   scss/_normalize.scss#
	new file:   scss/_presentation.scss
	new file:   scss/_projetSection.scss
	new file:   scss/_variable.scss
	modified:   scss/main.scss
quit
merge
intégration du css de la page mesProjets
intégration page html à propos + quelques correction
ajout du style sur propos
remise à niveau de propos
autre menu
retour à la normal