My commit before the latest pull/merge
Synced server.js and routes.js before latest pull
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev

Conflicts:
	app/server/config/routes.js
	app/server/database/testDatabase.js
	app/server/database/testUser.js
	app/server/server.js
Added stylesheet folder to app/client. Modified Gruntfile and Index.html to compile/resolve scss
Don't need to port bootstrap stylesheets. They're imported in app.scss
Fixed index.html
Deleted testDb and testUser. Modified a few back-end files. Searchbar query to db works now.
Factory handles items that do not exist in db. If there's enough time, I could throw in a separate view for this.
Merge pull request #50 from collinwu/dev

scss working. searchbar e2e working where there's only (unique) 1 of each item inserted in the inventory table.