modif titre tamer
Merge branch 'master' of https://github.com/Shyzuna/Test

Conflicts:
	index.php