stage2
stage2
hyper
hyper
Merge branch 'develop'

Conflicts:
	index.html
	target/gls2.js