ok
Merge branch 'master' of https://github.com/MaxChaza/Localhost

Conflicts:
	PhpToSQL_1/counter/counter.txt
maj web