hello
Merge branch 'master' of https://github.com/jinRuan/datwordapp

Conflicts:
	index2.html
	main.js