ajout biaou
bi
Merge branch 'master' of https://github.com/ld-chok/tms

Conflicts:
	indexx.html
Merge branch 'master' of https://github.com/ld-chok/tms

Conflicts:
	indexx.html