commiting for merge
Merge branch 'master' of https://github.com/sedouard/Txt.Us
hjgfkl;'
Merge branch 'master' of https://github.com/sedouard/Txt.Us
initiate merge...
Merge branch 'master' of https://github.com/sedouard/Txt.Us

Conflicts:
	server.js