adding bubbles
some fixes
Merge remote-tracking branch 'batweasel/master'

Conflicts:
	static/11/index.html