change the api method
change api method
Merge branch 'development' of github.com:Whoaa512/meal-balance into development

Conflicts:
	client/scripts/pearsonApi.js
Merge branch 'development' of github.com:Whoaa512/meal-balance into development
Merge pull request #23 from ndhoule/development

Wired up search button
Merge pull request #24 from ndhoule/development

Added extraction of dietary restriction checkboxes
geting diet restrictions
Merge branch 'development' of github.com:Whoaa512/meal-balance into development
made restriction hash and result actually filtered all the restrictions
Merge pull request #25 from junejung/development

return diet restriction filtered result
fixed filtering error
Merge pull request #27 from junejung/development

fixed filtering error
showing recipe data
Merge pull request #28 from mtulac/megantulac

showing recipe data
Added loading modal, fixed keydown regression