border-sizing:border-box;
Merge branch 'master' of https://github.com/LSERRE/Dataviz-Education

Conflicts:
	css/style.css