Delete .DS_Store
removed .DS_Store
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev
Refactored app directory structure. (still broken though)
Merge branch 'oopsDev' into dev
Modified searchresults and searchbar
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev

Conflicts:
	.DS_Store
Got inventory working on new directory structure
Merge pull request #17 from mLuby/dev

Merged.
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
Testing works
Search results now render. Search bar in progress.
Updated .gitignore to include npm-debug-log.
Merge branch 'dev' of https://github.com/bravebeehive/lenderbee into dev

Conflicts:
	.gitignore
Added necessary base dependencies for server (Express, Body Parser).
Framed out skeleton for server instantiation.
Created and tested default/test route using router.
Adds base logic for the server, including a test route
and the skeleton for a few key database queries (to be filled-in by Tommy).
Pulled out the factory into another service module. Working on searchbar controller.
Searchbar redirecting to results. Added tests for searchbar and searchresults.
Updated Express skeleton.
Delete .DS_Store