test new commit
Merge branch 'master' of https://github.com/kinglio8520/code_example

Conflicts:
	newjs.js