Added filtering on effects
Added filtering on effects
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/pages/effects.ejs