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
Merge branch 'dev' of https://github.com/BraveBeehive/LenderBee into dev
Merge pull request #35 from collinwu/dev

Refactored factory into its own module; tests up for searchresults and searchbar.