user bug fix
rita's search function
Merge branch 'master' into ryan