UPDATE JS code
Merge branch 'develop' of https://github.com/ktc19/test into develop

Conflicts:
	main.js