Users can add or borrow items, and conditionally lend, demand, and return items.
Merge pull request #39 from mLuby/dev

Users can add or borrow items, & conditionally lend, demand, & return them
Fixed spec typo
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev
Merge pull request #40 from JonathanWarrick/dev

Sounds good Jonathan.

Merged.
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev
Searchbar view updated with logic to pass to controller/factory. Query string should be parsable.
Added another searchbar test. However, Karma unit tests are breaking.
Merge pull request #42 from collinwu/dev

Fixed spec typo. Updated searchbar view and controller along with the search factory.
attempt to get bootstrap css didnt fully work
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev
Grunt finally works and does tests.
Added database piece for testing purposes.
Minor changes to formatting to keep Grunt happy.
Added db file for testing.
Merge branch 'dev' of https://github.com/bravebeehive/lenderbee into dev
Merge pull request #45 from mLuby/dev

Fixed JSHint errors & made 'grunt' work.
Merge branch 'dev' of https://github.com/bravebeehive/lenderbee into dev

Conflicts:
	app/server/config/routes.js
Updated configuration for routes.js to take searchbar requests properly.
Updated server.js to properly serve static index.html and bower_components files.
Removed testDatabase.js and testUser.js to replace with actual Bookshelf/Postgres setup.
Merge branch 'test_routing' into database