made some minor changes to the edit-function, and also added an searchbar
Merge branch 'master' of https://github.com/Naztor/freezing-shame into Kristoffers_workingbranch