added search functionality
Conflicts resolved in search template
Conflicts resolved in app.css