test for conflict
Merge branch 'master' of https://github.com/kxu913/knt

Conflicts:
	ny6design/ny6design_web/src/main/webapp/static/js/index.js