more work
Merge branch 'work1'

Conflicts:
	init.js