bareBonesCommit
Merge branch 'master' of https://github.com/abhididdigi/txtWeb

Conflicts:
	package.json
	web.js