Merge branch 'master' of https://github.com/lmtm/site

Conflicts:
services.html
societe.html
Merge branch 'master' of https://github.com/lmtm/site

Conflicts:
	services.html
	societe.html