Added more tests to DatabaseModelTest, removed swipeToRemove from DatabaseModel
fixing conflicts and merging
Merge branch 'master' of github.com:jfmyers9/ThePantry