modified:   jslearn1/.idea/workspace.xml
	modified:   jslearn1/point/templates/main.html
Merge branch 'master' of https://github.com/DomainLider/js1 into 1

Conflicts:
	jslearn1/.idea/workspace.xml
	jslearn1/point/templates/main.html