maj css decalage ecran acc
orga css et resize police
maj css font size
maj
maj css
Merge branch 'master' of github.com:gregqivivo/myQivivo

Conflicts:
	css/global.css
	index.html