Modified searchresults and searchbar
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev

Conflicts:
	.DS_Store
Resolved app.js conflict by incorporating Mike's logic

Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev

Conflicts:
	app/client/app.js
Search results now render. Search bar in progress.
Pulled out the factory into another service module. Working on searchbar controller.
Searchbar redirecting to results. Added tests for searchbar and searchresults.
Delete .DS_Store
Removed DS Store again
Merge branch 'dev' of https://github.com/collinwu/LenderBee into dev
Reverted css dependency from .scss back to .css
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev

Conflicts:
	app/client/inventory/inventorySpec.js
Update README.md

Added a placeholder for a quick description on file structure
Merge pull request #34 from JonathanWarrick/dev

Re-configured file structure to place server.js, config directory in correct location.

Merging. Will do a pull from master dev and then submit my pull request.
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev
Added testUser and testDatabase to test on fake users in a temporary MongoDB.
Configured Passport with Local Strategy to add and save users in temp DB.
Moved all test routing to routes.js.
Temporarily removed all use of Express Routers to simplify multiple changes.
Will be reimplemented once routing, authentication is finalized.
Framework for logging users in has been built using local strategy.
Currently returns simple responses for each possible outcome:
-User not found.
-User found, but password incorrect.
-User found, password correct, logged-in successfully.
Merge pull request #35 from collinwu/dev

Refactored factory into its own module; tests up for searchresults and searchbar.
Registered as Facebook Developer to receive App ID and Secret.
Completed logic for Passport Facebook Strategy.
Not yet tested; need to create a dummy page to test.
Completed passport.js file for Facebook Authentication.