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
Removed duplication for route-handling.
Added new line to database files.
Adds back testDatabase.js.
Update README.md
Refactored database.js and passport.js to use proper Bookshelf schema and Postgres DB.
Converted from MongoDB and tested user authentication via Facebook.
Currently, adding a new user works, but check for existing user in database does not.
Changed route configuration to utilize util.searchForItemInInventory for searchbar.
This will be used to test basic functionality from start-to-finish.
Merge pull request #46 from JonathanWarrick/dev

Adds database pieces, minor changes to routing/server, minor changes to formatting
My commit before the latest pull/merge