finished filter function
Merge branch 'master' into javier
filter
sign up style