added search bar back in
Merge pull request #29 from laurenfazah/master

added search bar back in, working out click voting, other tweaks
fixed merging problems and added serach bar