working on search page
Merge branch 'master' into design
some PEP8 fixes
working on search page
working on search
working on search
Merge master
styling event without picture
working on search
working on search
margin master into design branch
Merged design branch from errchy
Fixed indentation
Merged from upstream master
Added search with different filters
More tests for searching
More tests and a bit of PEP8 fixes
Merge pull request #126 from sparkica/fea_search

Added basic search functionality
Merged from master and fixed tests