josué test
Merge branch 'master' of https://github.com/bnjjj/texting
josué
Conflicts:
	main.js