new file:   httpd.conf
Modif css
Merge branch 'highcharts'
	modified:   css/style.css
	new file:   rendu1.php
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website

Conflicts:
	index.php

	modified:   css/style.css
	modified:   footer.php
	new file:   img/RTE_logo.png
	modified:   img/bg_fondbleu.jpg
	new file:   img/footer.png
	modified:   img/header.png
	new file:   img/home.png
	new file:   img/imag.jpg
	new file:   img/logo-ujf-gs.gif
	new file:   img/logo_ujf.jpg
	new file:   img/miage.png
	new file:   img/rte.png
	modified:   index.php
	new file:   js/bootstrap.js
	new file:   js/bootstrap.min.js
	modified:   menu.php
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/readme.txt
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/webtreats_whitewashed_grunge.pat
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/webtreats_whitewashed_grunge_1.png
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/webtreats_whitewashed_grunge_2.png
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/webtreats_whitewashed_grunge_3.png
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/webtreats_whitewashed_grunge_4.png
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/webtreats_whitewashed_grunge_5.png
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/webtreats_whitewashed_grunge_6.png
	new file:   texture/Whitewashed.Grunge.Textures.by.WebTreatsETC/webtreats_whitewashed_grunge_patterns.png
	renamed:    img/bg_fondbleu.jpg -> texture/webtreats_whitewashed_grunge_patterns/bg_fondbleu.jpg
	new file:   texture/webtreats_whitewashed_grunge_patterns/readme.txt
	new file:   texture/webtreats_whitewashed_grunge_patterns/webtreats_whitewashed_grunge.pat
	new file:   texture/webtreats_whitewashed_grunge_patterns/webtreats_whitewashed_grunge_1.png
	new file:   texture/webtreats_whitewashed_grunge_patterns/webtreats_whitewashed_grunge_2.png
	new file:   texture/webtreats_whitewashed_grunge_patterns/webtreats_whitewashed_grunge_3.png
	new file:   texture/webtreats_whitewashed_grunge_patterns/webtreats_whitewashed_grunge_4.png
	new file:   texture/webtreats_whitewashed_grunge_patterns/webtreats_whitewashed_grunge_5.png
	new file:   texture/webtreats_whitewashed_grunge_patterns/webtreats_whitewashed_grunge_6.png
	new file:   texture/webtreats_whitewashed_grunge_patterns/webtreats_whitewashed_grunge_patterns.png
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website
	modified:   index.php
	modified:   rendu1.php
parc calcule
	modified:   css/style.css
	new file:   img/aliane2.png
	modified:   menu.php
	modified:   rendu1.php
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website
rendu1.php termine, manque le dernier bouton
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website
ajout du mix
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website
modification du fond pour le rendu2
bouton
Merge branch 'master' of https://github.com/MonMIEL/MonMIEL_Website
liens du menu