Adding new stuff
Adding new stuff effects and shit
latest changes
latest changes
Merge remote-tracking branch 'batweasel/master'

Conflicts:
	static/11/index.html
	static/11/jquery.min.js