commit
Merge branch 'master' of github.com:qtang3/test into work1

Conflicts:
	init.js
Merge pull request #7 from qtang3/work1

commit