Voici leur histoire

Tonh Tonnnnnh!
Merge branch 'master' of https://github.com/Bloshi/Data-visualitation

Conflicts:
	sith/css/styles.css
	sith/images/bg-scrollbar-thumb-y.png
	sith/images/bg-scrollbar-track-y.png
	sith/images/bg-scrollbar-trackend-y.png
	sith/index.html
	sith/js/jquery.tinyscrollbar.js
	sith/js/meny.js
	sith/js/meny.min.js
	sith/js/tinyscrollbar.js
	sith/typos/generator_config.txt
	sith/typos/lato-bold-demo.html
	sith/typos/lato-bold-webfont.eot
	sith/typos/lato-bold-webfont.svg
	sith/typos/lato-bold-webfont.ttf
	sith/typos/lato-bold-webfont.woff
	sith/typos/lato-regular-demo.html
	sith/typos/lato-regular-webfont.eot
	sith/typos/lato-regular-webfont.svg
	sith/typos/lato-regular-webfont.ttf
	sith/typos/lato-regular-webfont.woff
	sith/typos/oswald-bold-demo.html
	sith/typos/oswald-bold-webfont.eot
	sith/typos/oswald-bold-webfont.svg
	sith/typos/oswald-bold-webfont.ttf
	sith/typos/oswald-bold-webfont.woff
	sith/typos/oswald-regular-demo.html
	sith/typos/oswald-regular-webfont.eot
	sith/typos/oswald-regular-webfont.svg
	sith/typos/oswald-regular-webfont.ttf
	sith/typos/oswald-regular-webfont.woff
	sith/typos/specimen_files/easytabs.js
	sith/typos/specimen_files/grid_12-825-55-15.css
	sith/typos/specimen_files/lato-bold-cleartype.png
	sith/typos/specimen_files/lato-regular-cleartype.png
	sith/typos/specimen_files/oswald-bold-cleartype.png
	sith/typos/specimen_files/oswald-regular-cleartype.png
	sith/typos/specimen_files/specimen_stylesheet.css
	sith/typos/stylesheet.css