Adding new stuff new bg
new stuff
Merge remote-tracking branch 'batweasel/master'

Conflicts:
	static/11/index.html
	static/11/ripple.js