Update README.md
Update README.md
Update README.md
Update README.md
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'develop'
Merge branch 'gh-pages'
hyper laser
Merge branch 'develop'

Conflicts:
	index.html
	target/gls2.js
laser
Merge commit '148749b220dd44e7164a5a368aa003841ef06db4' into develop
build
Merge branch 'develop' into gh-pages

Conflicts:
	target/gls2.js