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
Removed vestigal searchform file
Update .gitignore
Merge pull request #22 from ndhoule/development

Removed vestigal searchform file
Search button now searches as well
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #23 from ndhoule/development

Wired up search button
Added extraction of dietary restriction checkboxes
Merge pull request #24 from ndhoule/development

Added extraction of dietary restriction checkboxes
showing recipe data