Added find(query)
Merge branch 'master' of https://github.com/DSRoden/home-inventory

Resolving conflict