Merge pull request #17 from junejung/development

result array provides recipe object that include direction
Added diet restrictions arrays
Simplified interface
Merge pull request #18 from ndhoule/development

Simplified interface to prep for searchbox-only frontend
design galore
Merge branch 'development' of https://github.com/Whoaa512/meal-balance into megantulac

Conflicts:
	client/css/app.css
	client/layouts/main.html
	client/layouts/searchForm.html
	client/scripts/pearsonApi.js
Basic searching working
Merge pull request #20 from mtulac/megantulac

logo and homepage design
Merge remote-tracking branch 'upstream/development' into development

Conflicts:
	client/scripts/main.js
Merge pull request #19 from ndhoule/development

Basic searching working
DS_Store cleanup, image reorganization
Merge pull request #21 from ndhoule/development

DS_Store cleanup, image reorganization
change the api method
change api method
Merge branch 'development' of github.com:Whoaa512/meal-balance into development

Conflicts:
	client/scripts/pearsonApi.js
Removed vestigal searchform file
Update .gitignore
Merge pull request #22 from ndhoule/development

Removed vestigal searchform file
Merge branch 'development' of github.com:Whoaa512/meal-balance into development
Search button now searches as well