added filtering
Merge branch 'master' of https://github.com/meever/Fun.git

Conflicts:
	public/css/myStyle.css
	views/index.ejs