3eme comm
Merge branch 'master' of https://github.com/bnjjj/texting

Conflicts:
	main.js