Revert "мамба хуямба"

This reverts commit 3235937e1ced3fe156133802c97019ab55568952.

Conflicts:
	js/effects.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/effects.js