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

Conflicts:
	PhpToSQL/counter/counterIndex.txt
	TP1/counter/counterIndex.txt